[Pikture-cvs] pikture/src Makefile.in,1.1.1.1,1.2 pikture.cpp,1.4,1.5 pikture.h,1.4,1.5 piktureui.rc
Status: Pre-Alpha
Brought to you by:
ferratus
Menu
▾
▴
[Pikture-cvs] pikture/src Makefile.in,1.1.1.1,1.2 pikture.cpp,1.4,1.5 pikture.h,1.4,1.5 piktureui.rc,1.2,1.3
|
From: Jonathan G. <fer...@us...> - 2004-07-19 10:35:59
|
Update of /cvsroot/pikture/pikture/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3049/src Modified Files: Makefile.in pikture.cpp pikture.h piktureui.rc Log Message: Small update to remove the very shameful hardcoded path. Let's pretend that never happened. Thank you. See you all in Ottawa Index: Makefile.in =================================================================== RCS file: /cvsroot/pikture/pikture/src/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.in 26 Jun 2004 01:44:57 -0000 1.1.1.1 --- Makefile.in 19 Jul 2004 10:35:49 -0000 1.2 *************** *** 659,663 **** #>+ 2 ! KDE_DIST=hi16-app-pikture.png doc_index.txt pikture.desktop hi32-app-pikture.png pikture.lsm piktureui.rc #>+ 2 --- 659,663 ---- #>+ 2 ! KDE_DIST=doc_index.txt pikture.desktop hi32-app-pikture.png hi16-app-pikture.png pikture.lsm piktureui.rc #>+ 2 Index: piktureui.rc =================================================================== RCS file: /cvsroot/pikture/pikture/src/piktureui.rc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** piktureui.rc 30 Jun 2004 05:33:48 -0000 1.2 --- piktureui.rc 19 Jul 2004 10:35:49 -0000 1.3 *************** *** 1,8 **** <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> <kpartgui name="pikture" version="1"> ! <MenuBar> ! <Menu name="file"><text>&File</text> ! <Action name="fileExport" /> ! </Menu> </MenuBar> </kpartgui> --- 1,58 ---- <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> <kpartgui name="pikture" version="1"> ! <MenuBar noMerge="1"> ! <Menu name="file"><text>&File</text> ! <Action name="file_new" /> ! <DefineGroup name="new_merge" /> ! <Action name="file_open" /> ! <Separator /> ! <Action name="file_save" /> ! <Action name="file_saveas" /> ! <Action name="fileExport" /> ! <Separator /> ! <Action name="file_print" /> ! <Separator /> ! <Action name="file_quit" /> ! </Menu> ! ! <Menu name="edit"><text>&Edit</text> ! <Action name="edit_undo" /> ! <Action name="edit_redo" /> ! <Separator /> ! <Action name="edit_cut" /> ! <Action name="edit_copy" /> ! <Action name="edit_paste" /> ! <Separator /> ! <Action name="edit_selectall" /> ! </Menu> ! ! <Menu name="settings"><text>&Settings</text> ! <Merge name="StandardToolBarMenuHandler"/> ! <DefineGroup name="show_merge" /> ! <DefineGroup name="configure_merge" /> ! <Separator /> ! <Action name="fullscreen" /> ! <Separator /> ! <Action name="options_configure_keybinding"/> ! <Action name="set_configure_toolbars"/> ! <Action name="settings_configure" /> ! </Menu> ! ! <Menu name="help"><text>&Help</text> ! <Action name="help_contents"/> ! <Action name="help_whats_this"/> ! <Action name="help_show_tip" /> ! <Separator/> ! <Action name="help_report_bug"/> ! <Separator/> ! <Action name="help_about_app"/> ! <Action name="help_about_kde"/> ! </Menu> </MenuBar> + + <ToolBar name="mainToolBar" noMerge="1"><text>Main Toolbar</text> + <Action name="file_new" /> + <Action name="file_open" /> + <Separator /> + </ToolBar> </kpartgui> Index: pikture.cpp =================================================================== RCS file: /cvsroot/pikture/pikture/src/pikture.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pikture.cpp 30 Jun 2004 05:33:47 -0000 1.4 --- pikture.cpp 19 Jul 2004 10:35:49 -0000 1.5 *************** *** 37,40 **** --- 37,42 ---- #include <qsplitter.h> #include <qiconset.h> + #include <kedittoolbar.h> + #include <qdir.h> #include "pikture.moc" *************** *** 53,58 **** #ifdef DEBUG ! // *** Ugly hack for now. ! createGUI("/home/jgrenier/dev/pikture/pikture/src/piktureui.rc"); #elif createGUI("piktureui.rc"); --- 55,61 ---- #ifdef DEBUG ! // *** Somewhat ugly hack for the DEBUG version. Need to look up a better solution ! // *** but at least, it has no hardcoded path now :) - Jon ! createGUI(QDir::currentDirPath() + QString("/../../src/piktureui.rc")); #elif createGUI("piktureui.rc"); *************** *** 109,112 **** --- 112,121 ---- // *** Edit / Deselect all KStdAction::deselect(this, SLOT(editDeselect()), actionCollection()); + + // *** Settings / Configure Pikture... + KStdAction::preferences(this, SLOT(showSettings()), actionCollection()); + + // *** Settings / Configure toolbar... + KStdAction::configureToolbars(this, SLOT(settingsConfigureToolbars()), actionCollection()); } *************** *** 264,265 **** --- 273,287 ---- /// @todo implement me } + + + void pikture::showSettings() + { + /// @todo implement me + } + + + void pikture::settingsConfigureToolbars() + { + KEditToolbar dlg(factory()); + dlg.exec(); + } Index: pikture.h =================================================================== RCS file: /cvsroot/pikture/pikture/src/pikture.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pikture.h 30 Jun 2004 05:33:47 -0000 1.4 --- pikture.h 19 Jul 2004 10:35:49 -0000 1.5 *************** *** 64,74 **** virtual ~pikture(); private: - KPopupMenu *mnuFile; ///< The File menu - KPopupMenu *mnuFileNew; ///< The File/New submenu - KPopupMenu *mnuEdit; ///< The Edit menu - KPopupMenu *mnuView; ///< The View menu - KPopupMenu *mnuSettings; ///< The Settings menu - KPopupMenu *mnuHelp; ///< The Help menu. Auto-generated via KDE's - KListView *lstAlbums; ///< List view for the albums (both static and dynamic) KIconView *icnTags; ///< Icon view for tags library. --- 64,67 ---- *************** *** 107,110 **** --- 100,105 ---- void editSelectAll(); void editUndo(); + void showSettings(); + void settingsConfigureToolbars(); }; |