[Pikture-cvs] pikture/src main.cpp,1.2,1.3 pikture.cpp,1.3,1.4 pikture.h,1.3,1.4 piktureui.rc,1.1.1.
Status: Pre-Alpha
Brought to you by:
ferratus
Menu
▾
▴
[Pikture-cvs] pikture/src main.cpp,1.2,1.3 pikture.cpp,1.3,1.4 pikture.h,1.3,1.4 piktureui.rc,1.1.1.1,1.2
|
From: Jonathan G. <fer...@us...> - 2004-06-30 05:33:57
|
Update of /cvsroot/pikture/pikture/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7363/src Modified Files: main.cpp pikture.cpp pikture.h piktureui.rc Log Message: Changed main form's UI to XML Gui system and updated standard templates and project files. Index: main.cpp =================================================================== RCS file: /cvsroot/pikture/pikture/src/main.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.cpp 27 Jun 2004 02:27:23 -0000 1.2 --- main.cpp 30 Jun 2004 05:33:47 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- #include <kcmdlineargs.h> #include <klocale.h> + #include <iostream> static const char description[] = *************** *** 46,50 **** KApplication app; pikture *mainWin = 0; ! if (app.isRestored()) { --- 47,51 ---- KApplication app; pikture *mainWin = 0; ! if (app.isRestored()) { *************** *** 57,61 **** /// @todo do something with the command line args here ! mainWin = new pikture(); app.setMainWidget( mainWin ); --- 58,62 ---- /// @todo do something with the command line args here ! mainWin = new pikture(); app.setMainWidget( mainWin ); Index: piktureui.rc =================================================================== RCS file: /cvsroot/pikture/pikture/src/piktureui.rc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** piktureui.rc 26 Jun 2004 01:44:57 -0000 1.1.1.1 --- piktureui.rc 30 Jun 2004 05:33:48 -0000 1.2 *************** *** 2,7 **** <kpartgui name="pikture" version="1"> <MenuBar> ! <Menu name="custom"><text>C&ustom</text> ! <Action name="custom_action" /> </Menu> </MenuBar> --- 2,7 ---- <kpartgui name="pikture" version="1"> <MenuBar> ! <Menu name="file"><text>&File</text> ! <Action name="fileExport" /> </Menu> </MenuBar> Index: pikture.cpp =================================================================== RCS file: /cvsroot/pikture/pikture/src/pikture.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pikture.cpp 28 Jun 2004 13:12:38 -0000 1.3 --- pikture.cpp 30 Jun 2004 05:33:47 -0000 1.4 *************** *** 36,39 **** --- 36,40 ---- #include <qlayout.h> #include <qsplitter.h> + #include <qiconset.h> #include "pikture.moc" *************** *** 48,55 **** this->statusBar()->insertItem(tr("Welcome to Pikture"),1, 1, true); - createUI(); createActions(); ! createMenus(); ! createToolbar(); this->adjustSize(); } --- 49,61 ---- this->statusBar()->insertItem(tr("Welcome to Pikture"),1, 1, true); createActions(); ! createMainUI(); ! ! #ifdef DEBUG ! // *** Ugly hack for now. ! createGUI("/home/jgrenier/dev/pikture/pikture/src/piktureui.rc"); ! #elif ! createGUI("piktureui.rc"); ! #endif this->adjustSize(); } *************** *** 60,101 **** ! void pikture::createMenus() { ! // *** Create the file menu with its action. ! mnuFile = new KPopupMenu(this); ! actFileExit->plug(mnuFile); ! // *** Create the edit menu with its action. ! mnuEdit = new KPopupMenu(this); ! // *** Create the help menu with its action. ! mnuHelp = this->helpMenu("", false); ! // *** Add menus to the menu bar. ! menuBar()->insertItem(tr("&File"), mnuFile, 0, 0); ! menuBar()->insertItem(tr("&Edit"), mnuEdit, 1, 1); ! menuBar()->insertItem(tr("&Help"), mnuHelp, 2, 2); ! } ! void pikture::createActions() ! { ! // *** File / Exit ! actFileExit = KStdAction::quit(this, SLOT(exit()), actionCollection()); ! actFileExit->setStatusText(tr("Exit the application.")); ! } ! void pikture::createToolbar() ! { ! actFileExit->plug(this->toolBar("mainToolbar")); } ! void pikture::createUI() { // *** Create the splitter splitMain = new QSplitter(Qt::Horizontal, this, "splitMain"); ! splitMain->setMinimumSize(650, 450); splitMain->setMaximumSize(32000,32000); splitMain->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); --- 66,120 ---- ! void pikture::createActions() { ! // *** File / New / Catalog ! KStdAction::openNew(this, SLOT(fileNewCatalog()), actionCollection()); ! // *** File / Open Catalog ! KStdAction::open(this, SLOT(fileOpen()), actionCollection()); ! ! // *** File / Save catalog ! KStdAction::save(this, SLOT(fileSave()), actionCollection()); ! ! // *** File / Save As (catalog)... ! KStdAction::saveAs(this, SLOT(fileSaveAs()), actionCollection()); ! ! // *** File / Print... ! KStdAction::print(this, SLOT(filePrint()), actionCollection()); ! // *** File / Export... ! (void) new KAction(tr("Export..."), 0, this, SLOT(fileExport()), actionCollection(), "fileExport"); ! // *** File / Exit ! KStdAction::quit(this, SLOT(fileExit()), actionCollection()); + // *** Edit / Undo + KStdAction::undo(this, SLOT(editUndo()), actionCollection()); ! // *** Edit / Redo ! KStdAction::redo(this, SLOT(editRedo()), actionCollection()); ! ! // *** Edit / Cut ! KStdAction::cut(this, SLOT(editCut()), actionCollection()); + // *** Edit / Copy + KStdAction::copy(this, SLOT(editCopy()), actionCollection()); ! // *** Edit / Paste ! KStdAction::paste(this, SLOT(editPaste()), actionCollection()); ! ! // *** Edit / Select all ! KStdAction::selectAll(this, SLOT(editSelectAll()), actionCollection()); ! ! // *** Edit / Deselect all ! KStdAction::deselect(this, SLOT(editDeselect()), actionCollection()); } ! void pikture::createMainUI() { // *** Create the splitter splitMain = new QSplitter(Qt::Horizontal, this, "splitMain"); ! splitMain->setMinimumSize(450, 350); splitMain->setMaximumSize(32000,32000); splitMain->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); *************** *** 110,114 **** // *** Create the list view for the album list. lstAlbums = new KListView(splitLeftBar, "lstAlbums"); ! lstAlbums->setMinimumSize(150,200); lstAlbums->setMaximumSize(32000,32000); lstAlbums->addColumn(tr("My albums")); --- 129,133 ---- // *** Create the list view for the album list. lstAlbums = new KListView(splitLeftBar, "lstAlbums"); ! lstAlbums->setMinimumSize(150,100); lstAlbums->setMaximumSize(32000,32000); lstAlbums->addColumn(tr("My albums")); *************** *** 118,122 **** // *** Create the tags icon view. icnTags = new KIconView(splitLeftBar, "icnTags"); ! icnTags->setMinimumSize(150,200); icnTags->setMaximumSize(32000,32000); icnTags->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); --- 137,141 ---- // *** Create the tags icon view. icnTags = new KIconView(splitLeftBar, "icnTags"); ! icnTags->setMinimumSize(150,100); icnTags->setMaximumSize(32000,32000); icnTags->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); *************** *** 125,134 **** frmInfos = new QFrame(splitLeftBar, "frmInfos"); frmInfos->setMinimumSize(150,150); ! frmInfos->setMaximumSize(32000,32000); frmInfos->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum, false); // *** Create the main tab widget. tabs = new QTabWidget(splitMain, "tabMain"); ! tabs->setMinimumSize(450, 300); tabs->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); tabThumbnailViewer = new QWidget(tabs, "tabThumbnailViewer"); --- 144,153 ---- frmInfos = new QFrame(splitLeftBar, "frmInfos"); frmInfos->setMinimumSize(150,150); ! frmInfos->setMaximumSize(32000,150); frmInfos->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum, false); // *** Create the main tab widget. tabs = new QTabWidget(splitMain, "tabMain"); ! tabs->setMinimumSize(300, 300); tabs->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); tabThumbnailViewer = new QWidget(tabs, "tabThumbnailViewer"); *************** *** 151,156 **** ! void pikture::exit() { this->close(); } --- 170,265 ---- ! void pikture::fileNewCatalog() { + /// @todo implement me + } + + + void pikture::fileNewAlbum() + { + /// @todo implement me + } + + + void pikture::fileNewTag() + { + /// @todo implement me + } + + void pikture::fileExport() + { + /// @todo implement me + } + + + void pikture::fileOpen() + { + /// @todo implement me + } + + + void pikture::filePrint() + { + /// @todo implement me + } + + + void pikture::fileSave() + { + /// @todo implement me + } + + + void pikture::fileSaveAs() + { + /// @todo implement me + } + + + void pikture::fileExit() + { + /// @todo implement me this->close(); } + + + void pikture::editCopy() + { + /// @todo implement me + } + + + void pikture::editCut() + { + /// @todo implement me + } + + + void pikture::editDeselect() + { + /// @todo implement me + } + + + void pikture::editPaste() + { + /// @todo implement me + } + + + void pikture::editRedo() + { + /// @todo implement me + } + + + void pikture::editSelectAll() + { + /// @todo implement me + } + + + void pikture::editUndo() + { + /// @todo implement me + } Index: pikture.h =================================================================== RCS file: /cvsroot/pikture/pikture/src/pikture.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pikture.h 28 Jun 2004 13:12:38 -0000 1.3 --- pikture.h 30 Jun 2004 05:33:47 -0000 1.4 *************** *** 65,71 **** private: KPopupMenu *mnuFile; ///< The File menu ! KAction *actFileExit; ///< The Exit program action. KPopupMenu *mnuEdit; ///< The Edit 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. --- 65,74 ---- 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. *************** *** 79,87 **** /** - * Creates the menus on the main application window. - */ - void createMenus(); - - /** * Creates the actions for the main window. */ --- 82,85 ---- *************** *** 89,102 **** /** - * Creates the toolbar for the main window. - */ - void createToolbar(); - - /** * Creates the generic UI (left toolbox + tabs) */ ! void createUI(); public slots: ! void exit(); }; --- 87,110 ---- /** * Creates the generic UI (left toolbox + tabs) */ ! void createMainUI(); public slots: ! void fileNewCatalog(); ! void fileNewAlbum(); ! void fileNewTag(); ! void fileExport(); ! void fileOpen(); ! void filePrint(); ! void fileSave(); ! void fileSaveAs(); ! void fileExit(); ! void editCopy(); ! void editCut(); ! void editDeselect(); ! void editPaste(); ! void editRedo(); ! void editSelectAll(); ! void editUndo(); }; |