[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:15:57 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=ff774b4
The following commit has been merged in the master branch:
commit ff774b4f11961ccf08f3fa9c59b7f61f8dace19e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Mon Aug 2 21:11:45 2010 +0000
Moved everything into what I expect the final directory structure will look like.
Seperated the demo application and chat widget library
Added the .ui file for the chat window configuration.
svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1158499
---
CMakeLists.txt | 30 +----
README | 6 +
KDEChatHandler.client => app/KDEChatHandler.client | 0
main.cpp => app/main.cpp | 0
mainwindow.cpp => app/mainwindow.cpp | 0
mainwindow.h => app/mainwindow.h | 0
...ktop.Telepathy.Client.KDEChatHandler.service.in | 0
config/README | 23 ++++
config/chatwindowconfig.ui | 145 +++++++++++++++++++++
data/README | 5 +
chatconnection.cpp => lib/chatconnection.cpp | 0
chatconnection.h => lib/chatconnection.h | 0
chatview.cpp => lib/chatview.cpp | 0
chatview.h => lib/chatview.h | 0
chatwindow.cpp => lib/chatwindow.cpp | 3 -
chatwindow.h => lib/chatwindow.h | 0
chatwindow.ui => lib/chatwindow.ui | 0
chatwindowstyle.cpp => lib/chatwindowstyle.cpp | 0
chatwindowstyle.h => lib/chatwindowstyle.h | 0
telepathychatinfo.cpp => lib/telepathychatinfo.cpp | 0
telepathychatinfo.h => lib/telepathychatinfo.h | 0
.../telepathychatmessageinfo.cpp | 0
.../telepathychatmessageinfo.h | 10 +-
23 files changed, 189 insertions(+), 33 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e89a4f..42508c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,32 +24,4 @@ include_directories (${KDE4_INCLUDES}
)
-set(telepathy_chat_handler_SRCS
- main.cpp
- mainwindow.cpp
- chatconnection.cpp
- chatwindow.cpp
- chatwindowstyle.cpp
- chatview.cpp
- telepathychatmessageinfo.cpp
- telepathychatinfo.cpp
-)
-
-
-set(telepathy_chat_handler_UI
- chatwindow.ui
-)
-
-kde4_add_ui_files(telepathy_chat_handler_SRCS ${telepathy_chat_handler_UI})
-
-kde4_add_executable(telepathy-chat-handler ${telepathy_chat_handler_SRCS})
-
-target_link_libraries(telepathy-chat-handler ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${TELEPATHY_QT4_LIBRARIES} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KUTILS_LIBS} )
-
-configure_file(org.freedesktop.Telepathy.Client.KDEChatHandler.service.in
- ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDEChatHandler.service)
-
-install(TARGETS telepathy-chat-handler ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDEChatHandler.service
- DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
-install(FILES KDEChatHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
+add_subdirectory(app)
\ No newline at end of file
diff --git a/README b/README
index eb55531..da7e25e 100644
--- a/README
+++ b/README
@@ -29,5 +29,11 @@ TODO:
Rename all the classes to something sensible. I need help with this.
Split into a library of a chatwidget that any app can use - and an awesome chat program.
+ I think we need to split the code as follows:
+
+ lib/ (the chatwindow library, that can be used any program)
+ lib/kcmodule (for configuring chat window style)
+ app/ (a main chat window application)
Try adding telepathy into another program to show my lib works as a lib. (maybe Geore's whiteboard program?)
+
diff --git a/KDEChatHandler.client b/app/KDEChatHandler.client
similarity index 100%
rename from KDEChatHandler.client
rename to app/KDEChatHandler.client
diff --git a/main.cpp b/app/main.cpp
similarity index 100%
rename from main.cpp
rename to app/main.cpp
diff --git a/mainwindow.cpp b/app/mainwindow.cpp
similarity index 100%
rename from mainwindow.cpp
rename to app/mainwindow.cpp
diff --git a/mainwindow.h b/app/mainwindow.h
similarity index 100%
rename from mainwindow.h
rename to app/mainwindow.h
diff --git a/org.freedesktop.Telepathy.Client.KDEChatHandler.service.in b/app/org.freedesktop.Telepathy.Client.KDEChatHandler.service.in
similarity index 100%
rename from org.freedesktop.Telepathy.Client.KDEChatHandler.service.in
rename to app/org.freedesktop.Telepathy.Client.KDEChatHandler.service.in
diff --git a/config/README b/config/README
new file mode 100644
index 0000000..521f5de
--- /dev/null
+++ b/config/README
@@ -0,0 +1,23 @@
+This is going to contain the folder for configuring the message view part of telepathy.
+
+Right now I will build it as an application but eventually it will be a KCModule.
+
+It also needs to compile against the chat window lib, not just recompile all the code with relative paths.
+
+The plan (in my head) is to have this then callable from applications implementing the message view. There is already a KCModule for emoticons.
+
+We also need to decide whether to configure globally or on a "per app using the lib" basis. Advantages to both.
+
+Roadmap:
+
+Make it read/write themename to a config file, and contents of checkboxes
+
+Use this config file in the lib code.
+
+Show a demo chat.
+
+Variants.
+
+KCmoduleify (or even just a widget? Discuss.)
+
+GHNS. Suggest new category in kde-look. Ideally sync Adium to a GHNS source.
\ No newline at end of file
diff --git a/config/chatwindowconfig.ui b/config/chatwindowconfig.ui
new file mode 100644
index 0000000..5910928
--- /dev/null
+++ b/config/chatwindowconfig.ui
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>280</width>
+ <height>291</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Dialog</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QDeclarativeView" name="declarativeView"/>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="1">
+ <widget class="KComboBox" name="kcombobox"/>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Message Style:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="KComboBox" name="kcombobox_2"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Variant:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="checkBox">
+ <property name="text">
+ <string>Show User Icons</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QCheckBox" name="checkBox_2">
+ <property name="text">
+ <string>Show Header</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="KFontRequester" name="kfontrequester"/>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Select Font: </string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>13</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>KFontRequester</class>
+ <extends>QWidget</extends>
+ <header>kfontrequester.h</header>
+ </customwidget>
+ <customwidget>
+ <class>KComboBox</class>
+ <extends>QComboBox</extends>
+ <header>kcombobox.h</header>
+ </customwidget>
+ <customwidget>
+ <class>QDeclarativeView</class>
+ <extends>QGraphicsView</extends>
+ <header>QtDeclarative/QDeclarativeView</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>Dialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>Dialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/data/README b/data/README
new file mode 100644
index 0000000..5974e21
--- /dev/null
+++ b/data/README
@@ -0,0 +1,5 @@
+This will contain some default themes to ship with telepathy.
+
+I think something very simple for use inside other applications, and something extremely fancy (Renkoo?) for our main chat application.
+
+Any default images and Template.html should go here too.
\ No newline at end of file
diff --git a/chatconnection.cpp b/lib/chatconnection.cpp
similarity index 100%
rename from chatconnection.cpp
rename to lib/chatconnection.cpp
diff --git a/chatconnection.h b/lib/chatconnection.h
similarity index 100%
rename from chatconnection.h
rename to lib/chatconnection.h
diff --git a/chatview.cpp b/lib/chatview.cpp
similarity index 100%
rename from chatview.cpp
rename to lib/chatview.cpp
diff --git a/chatview.h b/lib/chatview.h
similarity index 100%
rename from chatview.h
rename to lib/chatview.h
diff --git a/chatwindow.cpp b/lib/chatwindow.cpp
similarity index 99%
rename from chatwindow.cpp
rename to lib/chatwindow.cpp
index 9ef782c..a4b5e47 100644
--- a/chatwindow.cpp
+++ b/lib/chatwindow.cpp
@@ -22,9 +22,6 @@ ChatWindow::ChatWindow(ChatConnection* chat, QWidget *parent) :
connect(m_chatConnection->channel().data(), SIGNAL(messageSent(Tp::Message, Tp::MessageSendingFlags, QString)), SLOT(handleMessageSent(Tp::Message, Tp::MessageSendingFlags, QString)));
connect(m_chatConnection->channel().data(), SIGNAL(chatStateChanged(Tp::ContactPtr, ChannelChatState)), SLOT(updateChatStatus(Tp::ContactPtr, ChannelChatState)));
connect(ui->sendMessageButton, SIGNAL(released()), SLOT(sendMessage()));
-
-
-
}
ChatWindow::~ChatWindow()
diff --git a/chatwindow.h b/lib/chatwindow.h
similarity index 100%
rename from chatwindow.h
rename to lib/chatwindow.h
diff --git a/chatwindow.ui b/lib/chatwindow.ui
similarity index 100%
rename from chatwindow.ui
rename to lib/chatwindow.ui
diff --git a/chatwindowstyle.cpp b/lib/chatwindowstyle.cpp
similarity index 100%
rename from chatwindowstyle.cpp
rename to lib/chatwindowstyle.cpp
diff --git a/chatwindowstyle.h b/lib/chatwindowstyle.h
similarity index 100%
rename from chatwindowstyle.h
rename to lib/chatwindowstyle.h
diff --git a/telepathychatinfo.cpp b/lib/telepathychatinfo.cpp
similarity index 100%
rename from telepathychatinfo.cpp
rename to lib/telepathychatinfo.cpp
diff --git a/telepathychatinfo.h b/lib/telepathychatinfo.h
similarity index 100%
rename from telepathychatinfo.h
rename to lib/telepathychatinfo.h
diff --git a/telepathychatmessageinfo.cpp b/lib/telepathychatmessageinfo.cpp
similarity index 100%
rename from telepathychatmessageinfo.cpp
rename to lib/telepathychatmessageinfo.cpp
diff --git a/telepathychatmessageinfo.h b/lib/telepathychatmessageinfo.h
similarity index 91%
rename from telepathychatmessageinfo.h
rename to lib/telepathychatmessageinfo.h
index ebd185b..4be66c4 100644
--- a/telepathychatmessageinfo.h
+++ b/lib/telepathychatmessageinfo.h
@@ -27,7 +27,14 @@ public:
QDateTime time() const {return m_time;}
void setTime(const QDateTime time){m_time = time;}
+ QString service() const {return m_service;}
+ void setService(const QString service) {m_service = service;}
+
+
+
//FIXME add the rest..
+ QString senderScreenName() const {return m_senderScreenName;}
+ void setSenderScreenName(const QString senderScreenName) {m_senderScreenName = senderScreenName;}
QString messageDirection() const {return m_messageDirection;}
void setMessageDirection(const QString messageDirection) {m_messageDirection = messageDirection;}
@@ -53,10 +60,11 @@ private:
QString m_service;
/** Will be replaced with "showIcons" if the "Show user icons" checkbox is selected, and will be replaced with "hideIcons" if the checkbox is deselected.*/
- //FIXME do above as an enum? replace in the filter.
+ //This is pure style - do in the chat view instead?
QString m_userIcons;
/** A space separated list of type information for messages, suitable for use as a class attribute. Currently available types are listed below. */
+ //do this on my magical "messageType enum"
QString m_messageClasses;
/** A description of the status event. This is neither in the user's local language nor expected to be displayed; it may be useful to use a different div class to present different types of status messages. The following is a list of some of the more important status messages; your message style should be able to handle being shown a status message not in this list, as even at present the list is incomplete and is certain to become out of date in the future: */
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list