From 15ee1478137bc748e27b0b06537973d8df04b9d7 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Wed, 20 Jun 2007 01:44:11 +0000 Subject: [PATCH] Finished file reorganization (for now). Sources are now in src/, subdir names have changed, and files from the former gui/ dir have been split up between the new qtgui/ and client/. Most, if not all files should now be at their final location, while the real work (cleaning up the code from the first phase of GUI reorganization, as well as doing the actual separation) begins now. --- Quassel.kdevelop.filelist | 155 +++++++++--------- src/CMakeLists.txt | 22 +-- src/client/client.cpp | 5 +- src/client/client.h | 6 +- src/client/clientproxy.cpp | 2 +- src/common/CMakeLists.txt | 10 +- src/common/main_mono.cpp | 6 +- {images => src/images}/default/1downarrow.png | Bin {images => src/images}/default/1leftarrow.png | Bin .../images}/default/1rightarrow.png | Bin {images => src/images}/default/1uparrow.png | Bin {images => src/images}/default/2dowarrow.png | Bin {images => src/images}/default/2downarrow.png | Bin {images => src/images}/default/2leftarrow.png | Bin .../images}/default/2rightarrow.png | Bin {images => src/images}/default/2uparrow.png | Bin {images => src/images}/default/3downarrow.png | Bin {images => src/images}/default/3uparrow.png | Bin {images => src/images}/default/add_user.png | Bin {images => src/images}/default/apply.png | Bin {images => src/images}/default/back.png | Bin {images => src/images}/default/bell.png | Bin {images => src/images}/default/bookmark.png | Bin .../images}/default/bookmark_add.png | Bin .../images}/default/bookmark_folder.png | Bin .../images}/default/bookmark_toolbar.png | Bin .../images}/default/bookmarks_list_add.png | Bin {images => src/images}/default/bottom.png | Bin .../images}/default/button_cancel.png | Bin {images => src/images}/default/button_ok.png | Bin {images => src/images}/default/cancel.png | Bin {images => src/images}/default/configure.png | Bin .../images}/default/configure_shortcuts.png | Bin .../images}/default/configure_toolbars.png | Bin .../images}/default/connect_creating.png | Bin .../images}/default/connect_established.png | Bin {images => src/images}/default/connect_no.png | Bin {images => src/images}/default/edit.png | Bin {images => src/images}/default/edit_add.png | Bin .../images}/default/edit_remove.png | Bin {images => src/images}/default/edit_user.png | Bin {images => src/images}/default/editcopy.png | Bin {images => src/images}/default/edittrash.png | Bin {images => src/images}/default/exit.png | Bin {images => src/images}/default/fileclose.png | Bin {images => src/images}/default/filenew.png | Bin {images => src/images}/default/fileopen.png | Bin {images => src/images}/default/fileprint.png | Bin {images => src/images}/default/filesave.png | Bin {images => src/images}/default/filesaveas.png | Bin {images => src/images}/default/finish.png | Bin {images => src/images}/default/folder.png | Bin {images => src/images}/default/folder_new.png | Bin {images => src/images}/default/fonts.png | Bin .../images}/default/fontsizedown.png | Bin {images => src/images}/default/fontsizeup.png | Bin {images => src/images}/default/forward.png | Bin {images => src/images}/default/help.png | Bin {images => src/images}/default/identity.png | Bin {images => src/images}/default/next.png | Bin {images => src/images}/default/no.png | Bin {images => src/images}/default/ok.png | Bin {images => src/images}/default/remove.png | Bin {images => src/images}/default/server.png | Bin {images => src/images}/default/start.png | Bin .../images}/default/status_unknown.png | Bin {images => src/images}/default/stop.png | Bin {images => src/images}/default/tab.png | Bin .../images}/default/tab_breakoff.png | Bin .../images}/default/tab_duplicate.png | Bin {images => src/images}/default/tab_first.png | Bin {images => src/images}/default/tab_last.png | Bin {images => src/images}/default/tab_left.png | Bin {images => src/images}/default/tab_new.png | Bin {images => src/images}/default/tab_new_bg.png | Bin .../images}/default/tab_new_raised.png | Bin {images => src/images}/default/tab_remove.png | Bin {images => src/images}/default/tab_right.png | Bin {images => src/images}/default/top.png | Bin {images => src/images}/default/trash.png | Bin {images => src/images}/default/tux.png | Bin {images => src/images}/default/up.png | Bin .../images}/default/view_bottom.png | Bin .../images}/default/view_choose.png | Bin .../images}/default/view_detailed.png | Bin {images => src/images}/default/view_icon.png | Bin .../images}/default/view_left_right.png | Bin .../images}/default/view_multicolumn.png | Bin .../images}/default/view_orientation.png | Bin .../images}/default/view_remove 2.png | Bin .../images}/default/view_remove.png | Bin {images => src/images}/default/view_right.png | Bin .../images}/default/view_sidetree.png | Bin {images => src/images}/default/view_split.png | Bin .../images}/default/view_top_bottom.png | Bin {images => src/images}/default/wizard.png | Bin {images => src/images}/iconmap.xml | 0 {images => src/images}/icons.qrc | 0 {images => src/images}/qirc-icon.png | Bin src/qtgui/CMakeLists.txt | 27 +-- src/qtgui/bufferviewwidget.h | 4 +- src/qtgui/bufferwidget.h | 2 +- src/qtgui/coreconnectdlg.cpp | 4 +- src/qtgui/coreconnectdlg.h | 3 +- src/qtgui/mainwin.cpp | 4 +- src/qtgui/mainwin.h | 2 +- src/qtgui/serverlist.cpp | 2 +- 107 files changed, 127 insertions(+), 127 deletions(-) rename {images => src/images}/default/1downarrow.png (100%) rename {images => src/images}/default/1leftarrow.png (100%) rename {images => src/images}/default/1rightarrow.png (100%) rename {images => src/images}/default/1uparrow.png (100%) rename {images => src/images}/default/2dowarrow.png (100%) rename {images => src/images}/default/2downarrow.png (100%) rename {images => src/images}/default/2leftarrow.png (100%) rename {images => src/images}/default/2rightarrow.png (100%) rename {images => src/images}/default/2uparrow.png (100%) rename {images => src/images}/default/3downarrow.png (100%) rename {images => src/images}/default/3uparrow.png (100%) rename {images => src/images}/default/add_user.png (100%) rename {images => src/images}/default/apply.png (100%) rename {images => src/images}/default/back.png (100%) rename {images => src/images}/default/bell.png (100%) rename {images => src/images}/default/bookmark.png (100%) rename {images => src/images}/default/bookmark_add.png (100%) rename {images => src/images}/default/bookmark_folder.png (100%) rename {images => src/images}/default/bookmark_toolbar.png (100%) rename {images => src/images}/default/bookmarks_list_add.png (100%) rename {images => src/images}/default/bottom.png (100%) rename {images => src/images}/default/button_cancel.png (100%) rename {images => src/images}/default/button_ok.png (100%) rename {images => src/images}/default/cancel.png (100%) rename {images => src/images}/default/configure.png (100%) rename {images => src/images}/default/configure_shortcuts.png (100%) rename {images => src/images}/default/configure_toolbars.png (100%) rename {images => src/images}/default/connect_creating.png (100%) rename {images => src/images}/default/connect_established.png (100%) rename {images => src/images}/default/connect_no.png (100%) rename {images => src/images}/default/edit.png (100%) rename {images => src/images}/default/edit_add.png (100%) rename {images => src/images}/default/edit_remove.png (100%) rename {images => src/images}/default/edit_user.png (100%) rename {images => src/images}/default/editcopy.png (100%) rename {images => src/images}/default/edittrash.png (100%) rename {images => src/images}/default/exit.png (100%) rename {images => src/images}/default/fileclose.png (100%) rename {images => src/images}/default/filenew.png (100%) rename {images => src/images}/default/fileopen.png (100%) rename {images => src/images}/default/fileprint.png (100%) rename {images => src/images}/default/filesave.png (100%) rename {images => src/images}/default/filesaveas.png (100%) rename {images => src/images}/default/finish.png (100%) rename {images => src/images}/default/folder.png (100%) rename {images => src/images}/default/folder_new.png (100%) rename {images => src/images}/default/fonts.png (100%) rename {images => src/images}/default/fontsizedown.png (100%) rename {images => src/images}/default/fontsizeup.png (100%) rename {images => src/images}/default/forward.png (100%) rename {images => src/images}/default/help.png (100%) rename {images => src/images}/default/identity.png (100%) rename {images => src/images}/default/next.png (100%) rename {images => src/images}/default/no.png (100%) rename {images => src/images}/default/ok.png (100%) rename {images => src/images}/default/remove.png (100%) rename {images => src/images}/default/server.png (100%) rename {images => src/images}/default/start.png (100%) rename {images => src/images}/default/status_unknown.png (100%) rename {images => src/images}/default/stop.png (100%) rename {images => src/images}/default/tab.png (100%) rename {images => src/images}/default/tab_breakoff.png (100%) rename {images => src/images}/default/tab_duplicate.png (100%) rename {images => src/images}/default/tab_first.png (100%) rename {images => src/images}/default/tab_last.png (100%) rename {images => src/images}/default/tab_left.png (100%) rename {images => src/images}/default/tab_new.png (100%) rename {images => src/images}/default/tab_new_bg.png (100%) rename {images => src/images}/default/tab_new_raised.png (100%) rename {images => src/images}/default/tab_remove.png (100%) rename {images => src/images}/default/tab_right.png (100%) rename {images => src/images}/default/top.png (100%) rename {images => src/images}/default/trash.png (100%) rename {images => src/images}/default/tux.png (100%) rename {images => src/images}/default/up.png (100%) rename {images => src/images}/default/view_bottom.png (100%) rename {images => src/images}/default/view_choose.png (100%) rename {images => src/images}/default/view_detailed.png (100%) rename {images => src/images}/default/view_icon.png (100%) rename {images => src/images}/default/view_left_right.png (100%) rename {images => src/images}/default/view_multicolumn.png (100%) rename {images => src/images}/default/view_orientation.png (100%) rename {images => src/images}/default/view_remove 2.png (100%) rename {images => src/images}/default/view_remove.png (100%) rename {images => src/images}/default/view_right.png (100%) rename {images => src/images}/default/view_sidetree.png (100%) rename {images => src/images}/default/view_split.png (100%) rename {images => src/images}/default/view_top_bottom.png (100%) rename {images => src/images}/default/wizard.png (100%) rename {images => src/images}/iconmap.xml (100%) rename {images => src/images}/icons.qrc (100%) rename {images => src/images}/qirc-icon.png (100%) diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist index 8fb3b40f..73fdb28c 100644 --- a/Quassel.kdevelop.filelist +++ b/Quassel.kdevelop.filelist @@ -1,86 +1,87 @@ # KDevelop Custom Project File List -core/core.cpp +client +client/buffer.cpp +client/buffer.h +client/client.cpp +client/client.h +client/clientproxy.cpp +client/clientproxy.h +CMakeLists.txt +common +common/CMakeLists.txt +common/global.cpp +common/global.h +common/logger.cpp +common/logger.h +common/main_core.cpp +common/main_gui.cpp +common/main_mono.cpp +common/message.cpp +common/message.h +common/proxy_common.h +common/settings.cpp +common/settings.h +common/util.cpp +common/util.h +core +core/backlog.cpp +core/backlog.h core/CMakeLists.txt +core/core.cpp core/core.h -gui/CMakeLists.txt -gui/mainwin.cpp -gui/mainwin.h -gui/serverlist.cpp -gui/serverlist.h -images/iconmap.xml -images/icons.qrc -main/main_core.cpp -main/main_mono.cpp -CMakeLists.txt -COPYING -Doxyfile -Makefile -gui/guiproxy.h -gui/guiproxy.cpp -main/main_gui.cpp core/coreproxy.cpp core/coreproxy.h -main/util.cpp -main/util.h -gui/coreconnectdlg.cpp -gui/coreconnectdlg.h -main/proxy_common.h -main/CMakeLists.txt -images/qirc-icon.png -main/global.cpp -main/global.h -gui/identities.cpp -gui/identities.h -gui/channelwidgetinput.h -gui/channelwidgetinput.cpp -plugins/plugin.h -gui/ui/channelwidget.ui -gui/ui/coreconnectdlg.ui -gui/ui/identitiesdlg.ui -gui/ui/identitieseditdlg.ui -gui/ui/ircwidget.ui -gui/ui/mainwin.ui -gui/ui/networkeditdlg.ui -gui/ui/nickeditdlg.ui -gui/ui/servereditdlg.ui -gui/ui/serverlistdlg.ui -gui/ui/settingsdlg.ui -gui/ui/bufferview.ui -gui/buffer.cpp -gui/buffer.h -main/message.cpp -main/message.h -gui/ui/bufferwidget.ui core/server.cpp core/server.h -gui/chatwidget.cpp -gui/chatwidget.h -gui/style.cpp -gui/style.h -main/logger.cpp -main/logger.h -templates/cpp -templates/h -gui/bufferwidget.h -gui/bufferwidget.cpp -main/settings.cpp -main/settings.h -gui/settingsdlg.h -gui/settingsdlg.cpp -gui/settingspages.cpp -gui/settingspages.h -gui/bufferview.cpp -gui/bufferview.h -core/backlog.cpp -core/backlog.h -ChangeLog -core/storage.cpp -core/storage.h core/sqlitestorage.cpp -dev-notes -dev-notes/builtin_cmds.obsolete.cpp -gui -gui/tabcompleter.cpp -gui/tabcompleter.h -core core/sqlitestorage.h +core/storage.cpp +core/storage.h +plugins +plugins/plugin.h +qtgui +qtgui/bufferview.cpp +qtgui/bufferview.h +qtgui/bufferviewwidget.cpp +qtgui/bufferviewwidget.h +qtgui/bufferwidget.cpp +qtgui/bufferwidget.h +qtgui/channelwidgetinput.cpp +qtgui/channelwidgetinput.h +qtgui/chatwidget.cpp +qtgui/chatwidget.h +qtgui/CMakeLists.txt +qtgui/coreconnectdlg.cpp +qtgui/coreconnectdlg.h +qtgui/identities.cpp +qtgui/identities.h +qtgui/mainwin.cpp +qtgui/mainwin.h +qtgui/serverlist.cpp +qtgui/serverlist.h +qtgui/settingsdlg.cpp +qtgui/settingsdlg.h +qtgui/settingspages.cpp +qtgui/settingspages.h +qtgui/style.cpp +qtgui/style.h +qtgui/tabcompleter.cpp +qtgui/tabcompleter.h +qtgui/ui +qtgui/ui/aboutdlg.ui +qtgui/ui/buffermgmntsettingspage.ui +qtgui/ui/bufferviewwidget.ui +qtgui/ui/bufferwidget.ui +qtgui/ui/channelwidget.ui +qtgui/ui/connectionsettingspage.ui +qtgui/ui/coreconnectdlg.ui +qtgui/ui/coresettingspage.ui +qtgui/ui/identitiesdlg.ui +qtgui/ui/identitieseditdlg.ui +qtgui/ui/ircwidget.ui +qtgui/ui/mainwin.ui +qtgui/ui/networkeditdlg.ui +qtgui/ui/nickeditdlg.ui +qtgui/ui/servereditdlg.ui +qtgui/ui/serverlistdlg.ui +qtgui/ui/settingsdlg.ui diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d2a89fd5..31227039 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,19 +31,19 @@ ENDIF(BUILD_CORE OR BUILD_GUI) SET(CMAKE_BUILD_TYPE Debug) # Define files -SET(quassel_mono_SRCS main/main_mono.cpp) -SET(quassel_core_SRCS main/main_core.cpp) -SET(quassel_gui_SRCS main/main_gui.cpp ${common_SRCS}) +SET(quassel_mono_SRCS common/main_mono.cpp) +SET(quassel_core_SRCS common/main_core.cpp) +SET(quassel_gui_SRCS common/main_gui.cpp ${common_SRCS}) SET(quassel_RCCS images/icons.qrc) -SET(quassel_DIRS main gui core) +SET(quassel_DIRS common qtgui core) # Build correct absolute paths for subdirs to include SET(SDIRS "") FOREACH(dir ${quassel_DIRS}) SET(SDIRS ${SDIRS} "${CMAKE_CURRENT_SOURCE_DIR}/${dir}") ENDFOREACH(dir) -INCLUDE_DIRECTORIES(${SDIRS} plugins) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${SDIRS} client plugins) +#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # We need Qt4 support. SET(QT_MIN_VERSION "4.3.0") # 4.3 is required for SSL, crypto and some other stuff @@ -59,7 +59,7 @@ INCLUDE(${QT_USE_FILE}) # Define subdirs. CMake complains if a directory is added twice, so make sure this # does not happen in any combination of the requested targets. -ADD_SUBDIRECTORY(main) +ADD_SUBDIRECTORY(common) IF(BUILD_CORE) ADD_SUBDIRECTORY(core) ENDIF(BUILD_CORE) @@ -74,7 +74,7 @@ SET(TARGET_LIST ) IF(BUILD_CORE) ADD_DEFINITIONS(-DBUILD_CORE) ADD_EXECUTABLE(quasselcore ${quassel_core_SRCS} ${_RCCS}) - TARGET_LINK_LIBRARIES(quasselcore core main ${QT_LIBRARIES}) + TARGET_LINK_LIBRARIES(quasselcore core common ${QT_LIBRARIES}) SET(TARGET_LIST ${TARGET_LIST} quasselcore) ENDIF(BUILD_CORE) @@ -84,19 +84,19 @@ IF(BUILD_GUI OR BUILD_MONO) # OK, now we need QtGui! SET(QT_INCLUDE_DIR "") SET(QT_LIBRARIES "") INCLUDE(${QT_USE_FILE}) - ADD_SUBDIRECTORY(gui) + ADD_SUBDIRECTORY(qtgui) IF(BUILD_MONO) ADD_DEFINITIONS(-DBUILD_MONO) ADD_EXECUTABLE(quassel ${quassel_mono_SRCS} ${_RCCS}) - TARGET_LINK_LIBRARIES(quassel gui core main ${QT_LIBRARIES}) + TARGET_LINK_LIBRARIES(quassel qtgui core common ${QT_LIBRARIES}) SET(TARGET_LIST ${TARGET_LIST} quassel) ENDIF(BUILD_MONO) IF(BUILD_GUI) ADD_DEFINITIONS(-DBUILD_GUI) ADD_EXECUTABLE(quasselgui ${quassel_gui_SRCS} ${_RCCS}) - TARGET_LINK_LIBRARIES(quasselgui gui main ${QT_LIBRARIES}) + TARGET_LINK_LIBRARIES(quasselgui qtgui common ${QT_LIBRARIES}) SET(TARGET_LIST ${TARGET_LIST} quasselgui) ENDIF(BUILD_GUI) diff --git a/src/client/client.cpp b/src/client/client.cpp index 1924001b..5211214c 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -18,11 +18,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "gui.h" -#include "guiproxy.h" +#include "client.h" +#include "clientproxy.h" #include "mainwin.h" #include "buffer.h" -//#include "bufferview.h" #include "bufferviewwidget.h" #include "util.h" diff --git a/src/client/client.h b/src/client/client.h index 2bf9c02f..3c6b56f9 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -28,12 +28,12 @@ #include "global.h" #include "buffer.h" #include "message.h" -#include "guiproxy.h" -#include "bufferviewwidget.h" +#include "clientproxy.h" +//#include "bufferviewwidget.h" class MainWin; class ClientProxy; -//class BufferTreeModel; +class BufferTreeModel; class Client : public QObject { Q_OBJECT diff --git a/src/client/clientproxy.cpp b/src/client/clientproxy.cpp index 5b6177fc..c991dba3 100644 --- a/src/client/clientproxy.cpp +++ b/src/client/clientproxy.cpp @@ -20,7 +20,7 @@ #include -#include "guiproxy.h" +#include "clientproxy.h" #include "util.h" #include "message.h" diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 32b82ba3..acfa640d 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,6 +1,6 @@ -SET(main_SRCS global.cpp logger.cpp util.cpp message.cpp settings.cpp) -SET(main_HDRS util.h message.h settings.h) -SET(main_MOCS global.h logger.h) +SET(common_SRCS global.cpp logger.cpp util.cpp message.cpp settings.cpp) +SET(common_HDRS util.h message.h settings.h) +SET(common_MOCS global.h logger.h) -QT4_WRAP_CPP(_MOC ${main_MOCS}) -ADD_LIBRARY(main ${_MOC} ${main_SRCS} ${main_HDRS}) +QT4_WRAP_CPP(_MOC ${common_MOCS}) +ADD_LIBRARY(common ${_MOC} ${common_SRCS} ${common_HDRS}) diff --git a/src/common/main_mono.cpp b/src/common/main_mono.cpp index 419b1505..f0bafd9e 100644 --- a/src/common/main_mono.cpp +++ b/src/common/main_mono.cpp @@ -22,17 +22,15 @@ #include -#include "gui.h" +#include "client.h" #include "core.h" #include "style.h" #include "global.h" -#include "guiproxy.h" +#include "clientproxy.h" #include "coreproxy.h" #include "settings.h" #include "chatwidget.h" -#include "mainwin.h" - int main(int argc, char **argv) { QApplication app(argc, argv); QCoreApplication::setOrganizationDomain("quassel-irc.org"); diff --git a/images/default/1downarrow.png b/src/images/default/1downarrow.png similarity index 100% rename from images/default/1downarrow.png rename to src/images/default/1downarrow.png diff --git a/images/default/1leftarrow.png b/src/images/default/1leftarrow.png similarity index 100% rename from images/default/1leftarrow.png rename to src/images/default/1leftarrow.png diff --git a/images/default/1rightarrow.png b/src/images/default/1rightarrow.png similarity index 100% rename from images/default/1rightarrow.png rename to src/images/default/1rightarrow.png diff --git a/images/default/1uparrow.png b/src/images/default/1uparrow.png similarity index 100% rename from images/default/1uparrow.png rename to src/images/default/1uparrow.png diff --git a/images/default/2dowarrow.png b/src/images/default/2dowarrow.png similarity index 100% rename from images/default/2dowarrow.png rename to src/images/default/2dowarrow.png diff --git a/images/default/2downarrow.png b/src/images/default/2downarrow.png similarity index 100% rename from images/default/2downarrow.png rename to src/images/default/2downarrow.png diff --git a/images/default/2leftarrow.png b/src/images/default/2leftarrow.png similarity index 100% rename from images/default/2leftarrow.png rename to src/images/default/2leftarrow.png diff --git a/images/default/2rightarrow.png b/src/images/default/2rightarrow.png similarity index 100% rename from images/default/2rightarrow.png rename to src/images/default/2rightarrow.png diff --git a/images/default/2uparrow.png b/src/images/default/2uparrow.png similarity index 100% rename from images/default/2uparrow.png rename to src/images/default/2uparrow.png diff --git a/images/default/3downarrow.png b/src/images/default/3downarrow.png similarity index 100% rename from images/default/3downarrow.png rename to src/images/default/3downarrow.png diff --git a/images/default/3uparrow.png b/src/images/default/3uparrow.png similarity index 100% rename from images/default/3uparrow.png rename to src/images/default/3uparrow.png diff --git a/images/default/add_user.png b/src/images/default/add_user.png similarity index 100% rename from images/default/add_user.png rename to src/images/default/add_user.png diff --git a/images/default/apply.png b/src/images/default/apply.png similarity index 100% rename from images/default/apply.png rename to src/images/default/apply.png diff --git a/images/default/back.png b/src/images/default/back.png similarity index 100% rename from images/default/back.png rename to src/images/default/back.png diff --git a/images/default/bell.png b/src/images/default/bell.png similarity index 100% rename from images/default/bell.png rename to src/images/default/bell.png diff --git a/images/default/bookmark.png b/src/images/default/bookmark.png similarity index 100% rename from images/default/bookmark.png rename to src/images/default/bookmark.png diff --git a/images/default/bookmark_add.png b/src/images/default/bookmark_add.png similarity index 100% rename from images/default/bookmark_add.png rename to src/images/default/bookmark_add.png diff --git a/images/default/bookmark_folder.png b/src/images/default/bookmark_folder.png similarity index 100% rename from images/default/bookmark_folder.png rename to src/images/default/bookmark_folder.png diff --git a/images/default/bookmark_toolbar.png b/src/images/default/bookmark_toolbar.png similarity index 100% rename from images/default/bookmark_toolbar.png rename to src/images/default/bookmark_toolbar.png diff --git a/images/default/bookmarks_list_add.png b/src/images/default/bookmarks_list_add.png similarity index 100% rename from images/default/bookmarks_list_add.png rename to src/images/default/bookmarks_list_add.png diff --git a/images/default/bottom.png b/src/images/default/bottom.png similarity index 100% rename from images/default/bottom.png rename to src/images/default/bottom.png diff --git a/images/default/button_cancel.png b/src/images/default/button_cancel.png similarity index 100% rename from images/default/button_cancel.png rename to src/images/default/button_cancel.png diff --git a/images/default/button_ok.png b/src/images/default/button_ok.png similarity index 100% rename from images/default/button_ok.png rename to src/images/default/button_ok.png diff --git a/images/default/cancel.png b/src/images/default/cancel.png similarity index 100% rename from images/default/cancel.png rename to src/images/default/cancel.png diff --git a/images/default/configure.png b/src/images/default/configure.png similarity index 100% rename from images/default/configure.png rename to src/images/default/configure.png diff --git a/images/default/configure_shortcuts.png b/src/images/default/configure_shortcuts.png similarity index 100% rename from images/default/configure_shortcuts.png rename to src/images/default/configure_shortcuts.png diff --git a/images/default/configure_toolbars.png b/src/images/default/configure_toolbars.png similarity index 100% rename from images/default/configure_toolbars.png rename to src/images/default/configure_toolbars.png diff --git a/images/default/connect_creating.png b/src/images/default/connect_creating.png similarity index 100% rename from images/default/connect_creating.png rename to src/images/default/connect_creating.png diff --git a/images/default/connect_established.png b/src/images/default/connect_established.png similarity index 100% rename from images/default/connect_established.png rename to src/images/default/connect_established.png diff --git a/images/default/connect_no.png b/src/images/default/connect_no.png similarity index 100% rename from images/default/connect_no.png rename to src/images/default/connect_no.png diff --git a/images/default/edit.png b/src/images/default/edit.png similarity index 100% rename from images/default/edit.png rename to src/images/default/edit.png diff --git a/images/default/edit_add.png b/src/images/default/edit_add.png similarity index 100% rename from images/default/edit_add.png rename to src/images/default/edit_add.png diff --git a/images/default/edit_remove.png b/src/images/default/edit_remove.png similarity index 100% rename from images/default/edit_remove.png rename to src/images/default/edit_remove.png diff --git a/images/default/edit_user.png b/src/images/default/edit_user.png similarity index 100% rename from images/default/edit_user.png rename to src/images/default/edit_user.png diff --git a/images/default/editcopy.png b/src/images/default/editcopy.png similarity index 100% rename from images/default/editcopy.png rename to src/images/default/editcopy.png diff --git a/images/default/edittrash.png b/src/images/default/edittrash.png similarity index 100% rename from images/default/edittrash.png rename to src/images/default/edittrash.png diff --git a/images/default/exit.png b/src/images/default/exit.png similarity index 100% rename from images/default/exit.png rename to src/images/default/exit.png diff --git a/images/default/fileclose.png b/src/images/default/fileclose.png similarity index 100% rename from images/default/fileclose.png rename to src/images/default/fileclose.png diff --git a/images/default/filenew.png b/src/images/default/filenew.png similarity index 100% rename from images/default/filenew.png rename to src/images/default/filenew.png diff --git a/images/default/fileopen.png b/src/images/default/fileopen.png similarity index 100% rename from images/default/fileopen.png rename to src/images/default/fileopen.png diff --git a/images/default/fileprint.png b/src/images/default/fileprint.png similarity index 100% rename from images/default/fileprint.png rename to src/images/default/fileprint.png diff --git a/images/default/filesave.png b/src/images/default/filesave.png similarity index 100% rename from images/default/filesave.png rename to src/images/default/filesave.png diff --git a/images/default/filesaveas.png b/src/images/default/filesaveas.png similarity index 100% rename from images/default/filesaveas.png rename to src/images/default/filesaveas.png diff --git a/images/default/finish.png b/src/images/default/finish.png similarity index 100% rename from images/default/finish.png rename to src/images/default/finish.png diff --git a/images/default/folder.png b/src/images/default/folder.png similarity index 100% rename from images/default/folder.png rename to src/images/default/folder.png diff --git a/images/default/folder_new.png b/src/images/default/folder_new.png similarity index 100% rename from images/default/folder_new.png rename to src/images/default/folder_new.png diff --git a/images/default/fonts.png b/src/images/default/fonts.png similarity index 100% rename from images/default/fonts.png rename to src/images/default/fonts.png diff --git a/images/default/fontsizedown.png b/src/images/default/fontsizedown.png similarity index 100% rename from images/default/fontsizedown.png rename to src/images/default/fontsizedown.png diff --git a/images/default/fontsizeup.png b/src/images/default/fontsizeup.png similarity index 100% rename from images/default/fontsizeup.png rename to src/images/default/fontsizeup.png diff --git a/images/default/forward.png b/src/images/default/forward.png similarity index 100% rename from images/default/forward.png rename to src/images/default/forward.png diff --git a/images/default/help.png b/src/images/default/help.png similarity index 100% rename from images/default/help.png rename to src/images/default/help.png diff --git a/images/default/identity.png b/src/images/default/identity.png similarity index 100% rename from images/default/identity.png rename to src/images/default/identity.png diff --git a/images/default/next.png b/src/images/default/next.png similarity index 100% rename from images/default/next.png rename to src/images/default/next.png diff --git a/images/default/no.png b/src/images/default/no.png similarity index 100% rename from images/default/no.png rename to src/images/default/no.png diff --git a/images/default/ok.png b/src/images/default/ok.png similarity index 100% rename from images/default/ok.png rename to src/images/default/ok.png diff --git a/images/default/remove.png b/src/images/default/remove.png similarity index 100% rename from images/default/remove.png rename to src/images/default/remove.png diff --git a/images/default/server.png b/src/images/default/server.png similarity index 100% rename from images/default/server.png rename to src/images/default/server.png diff --git a/images/default/start.png b/src/images/default/start.png similarity index 100% rename from images/default/start.png rename to src/images/default/start.png diff --git a/images/default/status_unknown.png b/src/images/default/status_unknown.png similarity index 100% rename from images/default/status_unknown.png rename to src/images/default/status_unknown.png diff --git a/images/default/stop.png b/src/images/default/stop.png similarity index 100% rename from images/default/stop.png rename to src/images/default/stop.png diff --git a/images/default/tab.png b/src/images/default/tab.png similarity index 100% rename from images/default/tab.png rename to src/images/default/tab.png diff --git a/images/default/tab_breakoff.png b/src/images/default/tab_breakoff.png similarity index 100% rename from images/default/tab_breakoff.png rename to src/images/default/tab_breakoff.png diff --git a/images/default/tab_duplicate.png b/src/images/default/tab_duplicate.png similarity index 100% rename from images/default/tab_duplicate.png rename to src/images/default/tab_duplicate.png diff --git a/images/default/tab_first.png b/src/images/default/tab_first.png similarity index 100% rename from images/default/tab_first.png rename to src/images/default/tab_first.png diff --git a/images/default/tab_last.png b/src/images/default/tab_last.png similarity index 100% rename from images/default/tab_last.png rename to src/images/default/tab_last.png diff --git a/images/default/tab_left.png b/src/images/default/tab_left.png similarity index 100% rename from images/default/tab_left.png rename to src/images/default/tab_left.png diff --git a/images/default/tab_new.png b/src/images/default/tab_new.png similarity index 100% rename from images/default/tab_new.png rename to src/images/default/tab_new.png diff --git a/images/default/tab_new_bg.png b/src/images/default/tab_new_bg.png similarity index 100% rename from images/default/tab_new_bg.png rename to src/images/default/tab_new_bg.png diff --git a/images/default/tab_new_raised.png b/src/images/default/tab_new_raised.png similarity index 100% rename from images/default/tab_new_raised.png rename to src/images/default/tab_new_raised.png diff --git a/images/default/tab_remove.png b/src/images/default/tab_remove.png similarity index 100% rename from images/default/tab_remove.png rename to src/images/default/tab_remove.png diff --git a/images/default/tab_right.png b/src/images/default/tab_right.png similarity index 100% rename from images/default/tab_right.png rename to src/images/default/tab_right.png diff --git a/images/default/top.png b/src/images/default/top.png similarity index 100% rename from images/default/top.png rename to src/images/default/top.png diff --git a/images/default/trash.png b/src/images/default/trash.png similarity index 100% rename from images/default/trash.png rename to src/images/default/trash.png diff --git a/images/default/tux.png b/src/images/default/tux.png similarity index 100% rename from images/default/tux.png rename to src/images/default/tux.png diff --git a/images/default/up.png b/src/images/default/up.png similarity index 100% rename from images/default/up.png rename to src/images/default/up.png diff --git a/images/default/view_bottom.png b/src/images/default/view_bottom.png similarity index 100% rename from images/default/view_bottom.png rename to src/images/default/view_bottom.png diff --git a/images/default/view_choose.png b/src/images/default/view_choose.png similarity index 100% rename from images/default/view_choose.png rename to src/images/default/view_choose.png diff --git a/images/default/view_detailed.png b/src/images/default/view_detailed.png similarity index 100% rename from images/default/view_detailed.png rename to src/images/default/view_detailed.png diff --git a/images/default/view_icon.png b/src/images/default/view_icon.png similarity index 100% rename from images/default/view_icon.png rename to src/images/default/view_icon.png diff --git a/images/default/view_left_right.png b/src/images/default/view_left_right.png similarity index 100% rename from images/default/view_left_right.png rename to src/images/default/view_left_right.png diff --git a/images/default/view_multicolumn.png b/src/images/default/view_multicolumn.png similarity index 100% rename from images/default/view_multicolumn.png rename to src/images/default/view_multicolumn.png diff --git a/images/default/view_orientation.png b/src/images/default/view_orientation.png similarity index 100% rename from images/default/view_orientation.png rename to src/images/default/view_orientation.png diff --git a/images/default/view_remove 2.png b/src/images/default/view_remove 2.png similarity index 100% rename from images/default/view_remove 2.png rename to src/images/default/view_remove 2.png diff --git a/images/default/view_remove.png b/src/images/default/view_remove.png similarity index 100% rename from images/default/view_remove.png rename to src/images/default/view_remove.png diff --git a/images/default/view_right.png b/src/images/default/view_right.png similarity index 100% rename from images/default/view_right.png rename to src/images/default/view_right.png diff --git a/images/default/view_sidetree.png b/src/images/default/view_sidetree.png similarity index 100% rename from images/default/view_sidetree.png rename to src/images/default/view_sidetree.png diff --git a/images/default/view_split.png b/src/images/default/view_split.png similarity index 100% rename from images/default/view_split.png rename to src/images/default/view_split.png diff --git a/images/default/view_top_bottom.png b/src/images/default/view_top_bottom.png similarity index 100% rename from images/default/view_top_bottom.png rename to src/images/default/view_top_bottom.png diff --git a/images/default/wizard.png b/src/images/default/wizard.png similarity index 100% rename from images/default/wizard.png rename to src/images/default/wizard.png diff --git a/images/iconmap.xml b/src/images/iconmap.xml similarity index 100% rename from images/iconmap.xml rename to src/images/iconmap.xml diff --git a/images/icons.qrc b/src/images/icons.qrc similarity index 100% rename from images/icons.qrc rename to src/images/icons.qrc diff --git a/images/qirc-icon.png b/src/images/qirc-icon.png similarity index 100% rename from images/qirc-icon.png rename to src/images/qirc-icon.png diff --git a/src/qtgui/CMakeLists.txt b/src/qtgui/CMakeLists.txt index d651be0c..367efa45 100644 --- a/src/qtgui/CMakeLists.txt +++ b/src/qtgui/CMakeLists.txt @@ -1,24 +1,27 @@ -SET(gui_SRCS gui.cpp chatwidget.cpp channelwidgetinput.cpp tabcompleter.cpp mainwin.cpp serverlist.cpp buffer.cpp bufferwidget.cpp - identities.cpp coreconnectdlg.cpp guiproxy.cpp bufferview.cpp bufferviewwidget.cpp style.cpp settingsdlg.cpp settingspages.cpp) -SET(gui_HDRS style.h) -SET(gui_MOCS gui.h chatwidget.h channelwidgetinput.h tabcompleter.h mainwin.h serverlist.h identities.h coreconnectdlg.h - guiproxy.h bufferview.h buffer.h bufferwidget.h bufferviewwidget.h settingsdlg.h settingspages.h) -SET(gui_UICS identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui +SET(qtgui_SRCS chatwidget.cpp channelwidgetinput.cpp tabcompleter.cpp mainwin.cpp serverlist.cpp bufferwidget.cpp + identities.cpp coreconnectdlg.cpp bufferview.cpp bufferviewwidget.cpp style.cpp settingsdlg.cpp settingspages.cpp) +SET(qtgui_HDRS style.h) +SET(qtgui_MOCS chatwidget.h channelwidgetinput.h tabcompleter.h mainwin.h serverlist.h identities.h coreconnectdlg.h + bufferview.h bufferwidget.h bufferviewwidget.h settingsdlg.h settingspages.h) +SET(qtgui_UICS identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui nickeditdlg.ui serverlistdlg.ui servereditdlg.ui coreconnectdlg.ui ircwidget.ui bufferviewwidget.ui bufferwidget.ui settingsdlg.ui buffermgmntsettingspage.ui connectionsettingspage.ui) +SET(client_SRCS ../client/client.cpp ../client/clientproxy.cpp ../client/buffer.cpp) +SET(client_MOCS ../client/client.h ../client/clientproxy.h ../client/buffer.h) + # This prepends ui/ to the UIC names, so we don't have to do this ourselves. -FOREACH(ui ${gui_UICS}) - SET(gui_UICS_UI ${gui_UICS_UI} "ui/${ui}") +FOREACH(ui ${qtgui_UICS}) + SET(qtgui_UICS_UI ${qtgui_UICS_UI} "ui/${ui}") ENDFOREACH(ui) -QT4_WRAP_UI(_UIC ${gui_UICS_UI}) -QT4_WRAP_CPP(_MOC ${gui_MOCS}) +QT4_WRAP_UI(_UIC ${qtgui_UICS_UI}) +QT4_WRAP_CPP(_MOC ${qtgui_MOCS} ${client_MOCS}) # We need to work around a dependency bug with out-of-source builds... # Seems to be fixed! #SET_SOURCE_FILES_PROPERTIES(${gui_SRCS} PROPERTIES OBJECT_DEPENDS "${_UIC}") -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} client) -ADD_LIBRARY(gui ${gui_HDRS} ${gui_SRCS} ${_MOC} ${_UIC}) +ADD_LIBRARY(qtgui ${qtgui_HDRS} ${qtgui_SRCS} ${client_SRCS} ${_MOC} ${_UIC}) diff --git a/src/qtgui/bufferviewwidget.h b/src/qtgui/bufferviewwidget.h index 24523aed..81b6455a 100644 --- a/src/qtgui/bufferviewwidget.h +++ b/src/qtgui/bufferviewwidget.h @@ -24,9 +24,9 @@ #include #include -#include "guiproxy.h" +#include "clientproxy.h" #include "buffer.h" -#include "gui/ui_bufferviewwidget.h" +#include "ui_bufferviewwidget.h" #include "bufferview.h" /***************************************** diff --git a/src/qtgui/bufferwidget.h b/src/qtgui/bufferwidget.h index fb68a484..b6dd62b9 100644 --- a/src/qtgui/bufferwidget.h +++ b/src/qtgui/bufferwidget.h @@ -21,7 +21,7 @@ #ifndef _BUFFERWIDGET_H_ #define _BUFFERWIDGET_H_ -#include "gui/ui_bufferwidget.h" +#include "ui_bufferwidget.h" #include "global.h" #include "message.h" diff --git a/src/qtgui/coreconnectdlg.cpp b/src/qtgui/coreconnectdlg.cpp index c0ca4808..d51bb5d8 100644 --- a/src/qtgui/coreconnectdlg.cpp +++ b/src/qtgui/coreconnectdlg.cpp @@ -20,9 +20,9 @@ #include #include "coreconnectdlg.h" -#include "guiproxy.h" +#include "clientproxy.h" #include "global.h" -#include "gui.h" +#include "client.h" CoreConnectDlg::CoreConnectDlg(QWidget *parent) : QDialog(parent) { ui.setupUi(this); diff --git a/src/qtgui/coreconnectdlg.h b/src/qtgui/coreconnectdlg.h index b3a82f4c..53fc4256 100644 --- a/src/qtgui/coreconnectdlg.h +++ b/src/qtgui/coreconnectdlg.h @@ -21,8 +21,7 @@ #ifndef _CORECONNECTDLG_H #define _CORECONNECTDLG_H -#include "coreconnectdlg.h" -#include "gui/ui_coreconnectdlg.h" +#include "ui_coreconnectdlg.h" class CoreConnectDlg: public QDialog { Q_OBJECT diff --git a/src/qtgui/mainwin.cpp b/src/qtgui/mainwin.cpp index 35441a1b..ddb23cfe 100644 --- a/src/qtgui/mainwin.cpp +++ b/src/qtgui/mainwin.cpp @@ -22,11 +22,11 @@ #include #include -#include "gui.h" +#include "client.h" #include "util.h" #include "global.h" #include "message.h" -#include "guiproxy.h" +#include "clientproxy.h" #include "mainwin.h" #include "buffer.h" diff --git a/src/qtgui/mainwin.h b/src/qtgui/mainwin.h index 7876b50d..1b32cdd2 100644 --- a/src/qtgui/mainwin.h +++ b/src/qtgui/mainwin.h @@ -22,7 +22,7 @@ #define _MAINWIN_H_ #include -#include "gui/ui_mainwin.h" +#include "ui_mainwin.h" #include "global.h" #include "message.h" diff --git a/src/qtgui/serverlist.cpp b/src/qtgui/serverlist.cpp index ab12919d..e221c736 100644 --- a/src/qtgui/serverlist.cpp +++ b/src/qtgui/serverlist.cpp @@ -20,7 +20,7 @@ #include "serverlist.h" #include "identities.h" -#include "guiproxy.h" +#include "clientproxy.h" /* NOTE: This dialog holds not only the server list, but also the identities. * This makes perfect sense given the fact that connections are initiated from -- 2.20.1