pikture-cvs Mailing List for Pikture
Status: Pre-Alpha
Brought to you by:
ferratus
You can subscribe to this list here.
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|
From: Jonathan G. <fer...@us...> - 2004-07-19 10:35:59
|
Update of /cvsroot/pikture/pikture In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3049 Modified Files: pikture.kdevelop pikture.kdevelop.pcs pikture.kdevses 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: pikture.kdevelop.pcs =================================================================== RCS file: /cvsroot/pikture/pikture/pikture.kdevelop.pcs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsAehOxg and /tmp/cvsgG5HEe differ Index: pikture.kdevses =================================================================== RCS file: /cvsroot/pikture/pikture/pikture.kdevses,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pikture.kdevses 30 Jun 2004 05:33:47 -0000 1.2 --- pikture.kdevses 19 Jul 2004 10:35:49 -0000 1.3 *************** *** 2,41 **** <!DOCTYPE KDevPrjSession> <KDevPrjSession> ! <DocsAndViews NumberOfDocuments="7" > <Doc0 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/pikture.h" > ! <View0 line="102" Type="???" > ! <AdditionalSettings Top="2" Width="1041" Attach="1" Height="679" Left="2" MinMaxMode="0" /> </View0> </Doc0> ! <Doc1 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/main.cpp" > ! <View0 line="67" Type="???" > ! <AdditionalSettings Top="2" Width="1041" Attach="1" Height="679" Left="2" MinMaxMode="0" /> </View0> </Doc1> ! <Doc2 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/thumbnailsviewer.h" > ! <View0 line="44" Type="???" > ! <AdditionalSettings Top="2" Width="1016" Attach="1" Height="621" Left="2" MinMaxMode="0" /> </View0> </Doc2> ! <Doc3 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/thumbnailsviewer.cpp" > ! <View0 line="32" Type="???" > ! <AdditionalSettings Top="2" Width="1041" Attach="1" Height="679" Left="2" MinMaxMode="0" /> </View0> </Doc3> - <Doc4 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/pikture.cpp" > - <View0 line="66" Type="???" > - <AdditionalSettings Top="2" Width="761" Attach="1" Height="679" Left="2" MinMaxMode="0" /> - </View0> - </Doc4> - <Doc5 context="ctx_doxygen" NumberOfViews="1" URL="file:/usr/kde/3.2/share/doc/HTML/en/kdelibs-apidocs/kdeui/html/classKMainWindow.html#a9" > - <View0 Type="???" > - <AdditionalSettings/> - </View0> - </Doc5> - <Doc6 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/piktureui.rc" > - <View0 line="4" Type="???" > - <AdditionalSettings Top="2" Width="761" Attach="1" Height="679" Left="2" MinMaxMode="0" /> - </View0> - </Doc6> </DocsAndViews> <pluginList> --- 2,26 ---- <!DOCTYPE KDevPrjSession> <KDevPrjSession> ! <DocsAndViews NumberOfDocuments="4" > <Doc0 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/pikture.h" > ! <View0 line="51" Type="???" > ! <AdditionalSettings Top="2" Width="1029" Attach="1" Height="773" Left="2" MinMaxMode="0" /> </View0> </Doc0> ! <Doc1 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/pikture.cpp" > ! <View0 line="58" Type="???" > ! <AdditionalSettings Top="2" Width="1029" Attach="1" Height="663" Left="2" MinMaxMode="0" /> </View0> </Doc1> ! <Doc2 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/piktureui.rc" > ! <View0 line="2" Type="???" > ! <AdditionalSettings Top="2" Width="1029" Attach="1" Height="663" Left="2" MinMaxMode="0" /> </View0> </Doc2> ! <Doc3 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/main.cpp" > ! <View0 line="48" Type="???" > ! <AdditionalSettings Top="2" Width="1029" Attach="1" Height="663" Left="2" MinMaxMode="0" /> </View0> </Doc3> </DocsAndViews> <pluginList> Index: pikture.kdevelop =================================================================== RCS file: /cvsroot/pikture/pikture/pikture.kdevelop,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pikture.kdevelop 30 Jun 2004 05:33:47 -0000 1.2 --- pikture.kdevelop 19 Jul 2004 10:35:49 -0000 1.3 *************** *** 15,19 **** <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> ! <description></description> <ignoreparts/> <secondaryLanguages/> --- 15,19 ---- <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> ! <description/> <ignoreparts/> <secondaryLanguages/> *************** *** 28,32 **** <directoryradio>executable</directoryradio> <customdirectory>/home/jgrenier/dev/pikture/pikture/src/</customdirectory> ! <programargs></programargs> <terminal>false</terminal> <autocompile>true</autocompile> --- 28,32 ---- <directoryradio>executable</directoryradio> <customdirectory>/home/jgrenier/dev/pikture/pikture/src/</customdirectory> ! <programargs/> <terminal>false</terminal> <autocompile>true</autocompile> *************** *** 58,62 **** <numberofjobs>1</numberofjobs> <dontact>false</dontact> ! <makebin></makebin> </make> </kdevautoproject> --- 58,62 ---- <numberofjobs>1</numberofjobs> <dontact>false</dontact> ! <makebin/> </make> </kdevautoproject> *************** *** 68,76 **** <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> <tree> ! <hidepatterns/> <hidenonprojectfiles>false</hidenonprojectfiles> ! <showvcsfields>false</showvcsfields> </tree> </kdevfileview> --- 68,78 ---- <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> + <hidenonprojectfiles>false</hidenonprojectfiles> + <hidenonlocation>false</hidenonlocation> </groups> <tree> ! <hidepatterns></hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> ! <showvcsfields>true</showvcsfields> </tree> </kdevfileview> *************** *** 140,148 **** <general> <dbgshell>libtool</dbgshell> ! <programargs></programargs> ! <gdbpath></gdbpath> ! <configGdbScript></configGdbScript> ! <runShellScript></runShellScript> ! <runGdbScript></runGdbScript> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> --- 142,150 ---- <general> <dbgshell>libtool</dbgshell> ! <programargs/> ! <gdbpath/> ! <configGdbScript/> ! <runShellScript/> ! <runGdbScript/> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> |
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(); }; |
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(); }; |
From: Jonathan G. <fer...@us...> - 2004-06-30 05:33:57
|
Update of /cvsroot/pikture/pikture/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7363/templates Modified Files: cpp h Log Message: Changed main form's UI to XML Gui system and updated standard templates and project files. Index: cpp =================================================================== RCS file: /cvsroot/pikture/pikture/templates/cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cpp 26 Jun 2004 01:45:07 -0000 1.1.1.1 --- cpp 30 Jun 2004 05:33:48 -0000 1.2 *************** *** 1,5 **** /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@so... * * * * This program is free software; you can redistribute it and/or modify * --- 1,5 ---- /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@li... * * * * This program is free software; you can redistribute it and/or modify * Index: h =================================================================== RCS file: /cvsroot/pikture/pikture/templates/h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** h 26 Jun 2004 01:45:07 -0000 1.1.1.1 --- h 30 Jun 2004 05:33:48 -0000 1.2 *************** *** 1,5 **** /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@so... * * * * This program is free software; you can redistribute it and/or modify * --- 1,5 ---- /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@li... * * * * This program is free software; you can redistribute it and/or modify * |
From: Jonathan G. <fer...@us...> - 2004-06-30 05:33:56
|
Update of /cvsroot/pikture/pikture In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7363 Modified Files: pikture.kdevelop pikture.kdevelop.pcs pikture.kdevses Log Message: Changed main form's UI to XML Gui system and updated standard templates and project files. Index: pikture.kdevelop.pcs =================================================================== RCS file: /cvsroot/pikture/pikture/pikture.kdevelop.pcs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvswEPxFp and /tmp/cvs2ThddC differ Index: pikture.kdevses =================================================================== RCS file: /cvsroot/pikture/pikture/pikture.kdevses,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** pikture.kdevses 26 Jun 2004 01:44:56 -0000 1.1.1.1 --- pikture.kdevses 30 Jun 2004 05:33:47 -0000 1.2 *************** *** 2,6 **** <!DOCTYPE KDevPrjSession> <KDevPrjSession> ! <DocsAndViews NumberOfDocuments="0" /> <pluginList> <kdevbookmarks> --- 2,42 ---- <!DOCTYPE KDevPrjSession> <KDevPrjSession> ! <DocsAndViews NumberOfDocuments="7" > ! <Doc0 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/pikture.h" > ! <View0 line="102" Type="???" > ! <AdditionalSettings Top="2" Width="1041" Attach="1" Height="679" Left="2" MinMaxMode="0" /> ! </View0> ! </Doc0> ! <Doc1 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/main.cpp" > ! <View0 line="67" Type="???" > ! <AdditionalSettings Top="2" Width="1041" Attach="1" Height="679" Left="2" MinMaxMode="0" /> ! </View0> ! </Doc1> ! <Doc2 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/thumbnailsviewer.h" > ! <View0 line="44" Type="???" > ! <AdditionalSettings Top="2" Width="1016" Attach="1" Height="621" Left="2" MinMaxMode="0" /> ! </View0> ! </Doc2> ! <Doc3 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/thumbnailsviewer.cpp" > ! <View0 line="32" Type="???" > ! <AdditionalSettings Top="2" Width="1041" Attach="1" Height="679" Left="2" MinMaxMode="0" /> ! </View0> ! </Doc3> ! <Doc4 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/pikture.cpp" > ! <View0 line="66" Type="???" > ! <AdditionalSettings Top="2" Width="761" Attach="1" Height="679" Left="2" MinMaxMode="0" /> ! </View0> ! </Doc4> ! <Doc5 context="ctx_doxygen" NumberOfViews="1" URL="file:/usr/kde/3.2/share/doc/HTML/en/kdelibs-apidocs/kdeui/html/classKMainWindow.html#a9" > ! <View0 Type="???" > ! <AdditionalSettings/> ! </View0> ! </Doc5> ! <Doc6 NumberOfViews="1" URL="file:/home/jgrenier/dev/pikture/pikture/src/piktureui.rc" > ! <View0 line="4" Type="???" > ! <AdditionalSettings Top="2" Width="761" Attach="1" Height="679" Left="2" MinMaxMode="0" /> ! </View0> ! </Doc6> ! </DocsAndViews> <pluginList> <kdevbookmarks> Index: pikture.kdevelop =================================================================== RCS file: /cvsroot/pikture/pikture/pikture.kdevelop,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** pikture.kdevelop 26 Jun 2004 01:44:56 -0000 1.1.1.1 --- pikture.kdevelop 30 Jun 2004 05:33:47 -0000 1.2 *************** *** 3,7 **** <general> <author>the Pikture Developers</author> ! <email>pik...@so...</email> <version>0.01</version> <projectmanagement>KDevKDEAutoProject</projectmanagement> --- 3,7 ---- <general> <author>the Pikture Developers</author> ! <email>pik...@li...</email> <version>0.01</version> <projectmanagement>KDevKDEAutoProject</projectmanagement> *************** *** 27,32 **** <mainprogram>src/pikture</mainprogram> <directoryradio>executable</directoryradio> ! <customdirectory>/</customdirectory> ! <programargs/> <terminal>false</terminal> <autocompile>true</autocompile> --- 27,32 ---- <mainprogram>src/pikture</mainprogram> <directoryradio>executable</directoryradio> ! <customdirectory>/home/jgrenier/dev/pikture/pikture/src/</customdirectory> ! <programargs></programargs> <terminal>false</terminal> <autocompile>true</autocompile> *************** *** 58,62 **** <numberofjobs>1</numberofjobs> <dontact>false</dontact> ! <makebin/> </make> </kdevautoproject> --- 58,62 ---- <numberofjobs>1</numberofjobs> <dontact>false</dontact> ! <makebin></makebin> </make> </kdevautoproject> *************** *** 68,77 **** <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> </groups> <tree> <hidepatterns/> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> </kdevfileview> --- 68,76 ---- <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> <tree> <hidepatterns/> <hidenonprojectfiles>false</hidenonprojectfiles> + <showvcsfields>false</showvcsfields> </tree> </kdevfileview> *************** *** 187,189 **** --- 186,195 ---- </references> </kdevcppsupport> + <kdevcvsservice> + <recursivewhenupdate>true</recursivewhenupdate> + <prunedirswhenupdate>true</prunedirswhenupdate> + <createdirswhenupdate>true</createdirswhenupdate> + <recursivewhencommitremove>true</recursivewhencommitremove> + <revertoptions>-C</revertoptions> + </kdevcvsservice> </kdevelop> |
From: Jonathan G. <fer...@us...> - 2004-06-28 13:12:47
|
Update of /cvsroot/pikture/pikture/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5645 Modified Files: pikture.cpp pikture.h Log Message: Fixed layout glitches in main form and added splitters. Index: pikture.cpp =================================================================== RCS file: /cvsroot/pikture/pikture/src/pikture.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pikture.cpp 27 Jun 2004 02:27:23 -0000 1.2 --- pikture.cpp 28 Jun 2004 13:12:38 -0000 1.3 *************** *** 35,38 **** --- 35,39 ---- #include <klistview.h> #include <qlayout.h> + #include <qsplitter.h> #include "pikture.moc" *************** *** 51,55 **** createMenus(); createToolbar(); ! //this->adjustSize(); } --- 52,56 ---- createMenus(); createToolbar(); ! this->adjustSize(); } *************** *** 94,123 **** void pikture::createUI() { ! // *** Main midget for the form. ! this->setCentralWidget(new QWidget(this, "centralWidget")); ! // *** Create the list view for the album list. ! lstAlbums = new KListView(this->centralWidget(), "lstAlbums"); lstAlbums->setMinimumSize(150,200); ! lstAlbums->setMaximumSize(200,32000); ! lstAlbums->addColumn(tr("Col")); ! lstAlbums->setColumnWidthMode(0,KListView::ff lstAlbums->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); ! // *** Create the tags icon view. ! icnTags = new KIconView(this->centralWidget(), "icnTags"); icnTags->setMinimumSize(150,200); ! icnTags->setMaximumSize(200,32000); icnTags->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); ! // *** Create the info frame. ! frmInfos = new QFrame(this->centralWidget(), "frmInfos"); frmInfos->setMinimumSize(150,150); ! frmInfos->setMaximumSize(200,32000); ! frmInfos->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); ! frmInfos->setCaption("test"); ! // *** Create the main tab widget. ! tabs = new QTabWidget(this->centralWidget(), "tabMain"); tabs->setMinimumSize(450, 300); tabs->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); --- 95,133 ---- 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); ! ! // *** Main midget for the form. ! this->setCentralWidget(splitMain); ! ! // *** Create the left-sidebar ! splitLeftBar = new QSplitter(Qt::Vertical, splitMain, "splitLeftBar"); ! splitLeftBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); ! // *** 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")); ! lstAlbums->setResizeMode(KListView::AllColumns); lstAlbums->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); ! // *** 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); ! // *** Create the info frame. ! 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); *************** *** 126,132 **** tabDetailsView = new QWidget(tabs, "tabDetailsView"); tabs->addTab(tabDetailsView, tr("Close-up")); ! // *** Create the thumbnails viewer. ! //thumbsView = new thumbnailsViewer(tabThumbnailViewer, "tabThumbs"); //thumbsView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); //thumbsView->setBackgroundColor(QColor("red")); --- 136,142 ---- tabDetailsView = new QWidget(tabs, "tabDetailsView"); tabs->addTab(tabDetailsView, tr("Close-up")); ! // *** Create the thumbnails viewer. ! //thumbsView = new thumbnailsViewer(tabThumbnailViewer, "tabThumbs"); //thumbsView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); //thumbsView->setBackgroundColor(QColor("red")); *************** *** 134,146 **** //vboxThumbnails->addWidget(thumbsView); ! // *** Set the widgets with their correct layout manager. ! QVBoxLayout *vboxLeft = new QVBoxLayout(); ! vboxLeft->addWidget(lstAlbums); ! vboxLeft->addWidget(icnTags); ! vboxLeft->addWidget(frmInfos); ! ! QHBoxLayout *hboxMain = new QHBoxLayout(this->centralWidget(), 11, 6, "mainLayout"); ! hboxMain->addLayout(vboxLeft); ! hboxMain->addWidget(tabs); } --- 144,151 ---- //vboxThumbnails->addWidget(thumbsView); ! // *** Set the splitter's resize mode. ! splitMain->setResizeMode(splitLeftBar, QSplitter::KeepSize); ! splitLeftBar->setResizeMode(frmInfos, QSplitter::KeepSize); ! splitLeftBar->setResizeMode(icnTags, QSplitter::KeepSize); } Index: pikture.h =================================================================== RCS file: /cvsroot/pikture/pikture/src/pikture.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pikture.h 27 Jun 2004 02:27:23 -0000 1.2 --- pikture.h 28 Jun 2004 13:12:38 -0000 1.3 *************** *** 39,42 **** --- 39,43 ---- class QGridLayout; class QTabWidget; + class QSplitter; /** *************** *** 74,77 **** --- 75,80 ---- QWidget *tabDetailsView; ///< Main widget for the details view tab. thumbnailsViewer *thumbsView; ///< The thumbnail viewer (tab1) + QSplitter *splitMain; ///< Main splitter for the interface. + QSplitter *splitLeftBar; ///< Left-sidebar splitter. /** *************** *** 84,96 **** */ void createActions(); ! /** * Creates the toolbar for the main window. ! */ void createToolbar(); ! /** * Creates the generic UI (left toolbox + tabs) ! */ void createUI(); public slots: --- 87,99 ---- */ void createActions(); ! /** * Creates the toolbar for the main window. ! */ void createToolbar(); ! /** * Creates the generic UI (left toolbox + tabs) ! */ void createUI(); public slots: |
From: Jonathan G. <fer...@us...> - 2004-06-27 02:27:33
|
Update of /cvsroot/pikture/pikture/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18845 Modified Files: main.cpp pikture.cpp pikture.h thumbnail.cpp thumbnail.h thumbnailsviewer.cpp thumbnailsviewer.h Log Message: new work on layout. Index: thumbnail.cpp =================================================================== RCS file: /cvsroot/pikture/pikture/src/thumbnail.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** thumbnail.cpp 26 Jun 2004 01:44:57 -0000 1.1.1.1 --- thumbnail.cpp 27 Jun 2004 02:27:23 -0000 1.2 *************** *** 1,5 **** /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@so... * * * * This program is free software; you can redistribute it and/or modify * --- 1,5 ---- /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@li... * * * * This program is free software; you can redistribute it and/or modify * Index: thumbnailsviewer.h =================================================================== RCS file: /cvsroot/pikture/pikture/src/thumbnailsviewer.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** thumbnailsviewer.h 26 Jun 2004 01:44:57 -0000 1.1.1.1 --- thumbnailsviewer.h 27 Jun 2004 02:27:23 -0000 1.2 *************** *** 1,5 **** /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@so... * * * * This program is free software; you can redistribute it and/or modify * --- 1,5 ---- /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@li... * * * * This program is free software; you can redistribute it and/or modify * *************** *** 43,47 **** Q_OBJECT public: ! thumbnailsViewer(); ~thumbnailsViewer(); --- 43,47 ---- Q_OBJECT public: ! thumbnailsViewer(QWidget *parent=0, const char *name=0); ~thumbnailsViewer(); Index: main.cpp =================================================================== RCS file: /cvsroot/pikture/pikture/src/main.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** main.cpp 26 Jun 2004 01:44:56 -0000 1.1.1.1 --- main.cpp 27 Jun 2004 02:27:23 -0000 1.2 *************** *** 1,5 **** /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@so... * * * * This program is free software; you can redistribute it and/or modify * --- 1,5 ---- /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@li... * * * * This program is free software; you can redistribute it and/or modify * *************** *** 39,43 **** { KAboutData about("pikture", I18N_NOOP("Pikture"), version, description, ! KAboutData::License_GPL, "(C) 2004 the Pikture Developers", 0, 0, "pik...@so..."); about.addAuthor( "Jonathan Grenier", "Lead developer. Project leader.", "jgr...@pi..." ); about.addAuthor( "Carl Pelletier", "Developer", "cpe...@pi..." ); --- 39,43 ---- { KAboutData about("pikture", I18N_NOOP("Pikture"), version, description, ! KAboutData::License_GPL, "(C) 2004 the Pikture Developers", 0, 0, "pik...@li..."); about.addAuthor( "Jonathan Grenier", "Lead developer. Project leader.", "jgr...@pi..." ); about.addAuthor( "Carl Pelletier", "Developer", "cpe...@pi..." ); Index: thumbnail.h =================================================================== RCS file: /cvsroot/pikture/pikture/src/thumbnail.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** thumbnail.h 26 Jun 2004 01:44:57 -0000 1.1.1.1 --- thumbnail.h 27 Jun 2004 02:27:23 -0000 1.2 *************** *** 1,5 **** /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@so... * * * * This program is free software; you can redistribute it and/or modify * --- 1,5 ---- /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@li... * * * * This program is free software; you can redistribute it and/or modify * Index: pikture.cpp =================================================================== RCS file: /cvsroot/pikture/pikture/src/pikture.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** pikture.cpp 26 Jun 2004 01:44:56 -0000 1.1.1.1 --- pikture.cpp 27 Jun 2004 02:27:23 -0000 1.2 *************** *** 1,5 **** /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@so... * * * * This program is free software; you can redistribute it and/or modify * --- 1,5 ---- /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@li... * * * * This program is free software; you can redistribute it and/or modify * *************** *** 20,23 **** --- 20,24 ---- #include "pikture.h" + #include "thumbnailsviewer.h" #include <kmainwindow.h> *************** *** 29,32 **** --- 30,38 ---- #include <kaction.h> #include <kstatusbar.h> + #include <qframe.h> + #include <qtabwidget.h> + #include <kiconview.h> + #include <klistview.h> + #include <qlayout.h> #include "pikture.moc" *************** *** 41,47 **** --- 47,55 ---- this->statusBar()->insertItem(tr("Welcome to Pikture"),1, 1, true); + createUI(); createActions(); createMenus(); createToolbar(); + //this->adjustSize(); } *************** *** 84,87 **** --- 92,149 ---- + void pikture::createUI() + { + // *** Main midget for the form. + this->setCentralWidget(new QWidget(this, "centralWidget")); + + // *** Create the list view for the album list. + lstAlbums = new KListView(this->centralWidget(), "lstAlbums"); + lstAlbums->setMinimumSize(150,200); + lstAlbums->setMaximumSize(200,32000); + lstAlbums->addColumn(tr("Col")); + lstAlbums->setColumnWidthMode(0,KListView::ff + lstAlbums->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); + + // *** Create the tags icon view. + icnTags = new KIconView(this->centralWidget(), "icnTags"); + icnTags->setMinimumSize(150,200); + icnTags->setMaximumSize(200,32000); + icnTags->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); + + // *** Create the info frame. + frmInfos = new QFrame(this->centralWidget(), "frmInfos"); + frmInfos->setMinimumSize(150,150); + frmInfos->setMaximumSize(200,32000); + frmInfos->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); + frmInfos->setCaption("test"); + + // *** Create the main tab widget. + tabs = new QTabWidget(this->centralWidget(), "tabMain"); + tabs->setMinimumSize(450, 300); + tabs->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); + tabThumbnailViewer = new QWidget(tabs, "tabThumbnailViewer"); + tabs->addTab(tabThumbnailViewer, tr("Thumbnails")); + tabDetailsView = new QWidget(tabs, "tabDetailsView"); + tabs->addTab(tabDetailsView, tr("Close-up")); + + // *** Create the thumbnails viewer. + //thumbsView = new thumbnailsViewer(tabThumbnailViewer, "tabThumbs"); + //thumbsView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, false); + //thumbsView->setBackgroundColor(QColor("red")); + //QVBoxLayout *vboxThumbnails = new QVBoxLayout(tabThumbnailViewer); + //vboxThumbnails->addWidget(thumbsView); + + // *** Set the widgets with their correct layout manager. + QVBoxLayout *vboxLeft = new QVBoxLayout(); + vboxLeft->addWidget(lstAlbums); + vboxLeft->addWidget(icnTags); + vboxLeft->addWidget(frmInfos); + + QHBoxLayout *hboxMain = new QHBoxLayout(this->centralWidget(), 11, 6, "mainLayout"); + hboxMain->addLayout(vboxLeft); + hboxMain->addWidget(tabs); + } + + void pikture::exit() { Index: thumbnailsviewer.cpp =================================================================== RCS file: /cvsroot/pikture/pikture/src/thumbnailsviewer.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** thumbnailsviewer.cpp 26 Jun 2004 01:44:57 -0000 1.1.1.1 --- thumbnailsviewer.cpp 27 Jun 2004 02:27:23 -0000 1.2 *************** *** 1,5 **** /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@so... * * * * This program is free software; you can redistribute it and/or modify * --- 1,5 ---- /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@li... * * * * This program is free software; you can redistribute it and/or modify * *************** *** 20,24 **** #include "thumbnailsviewer.h" ! thumbnailsViewer::thumbnailsViewer() { } --- 20,24 ---- #include "thumbnailsviewer.h" ! thumbnailsViewer::thumbnailsViewer(QWidget *parent, const char *name) : QCanvas(parent, name) { } Index: pikture.h =================================================================== RCS file: /cvsroot/pikture/pikture/src/pikture.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** pikture.h 26 Jun 2004 01:44:57 -0000 1.1.1.1 --- pikture.h 27 Jun 2004 02:27:23 -0000 1.2 *************** *** 1,5 **** /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@so... * * * * This program is free software; you can redistribute it and/or modify * --- 1,5 ---- /*************************************************************************** * Copyright (C) 2004 by the Pikture Developers * ! * pik...@li... * * * * This program is free software; you can redistribute it and/or modify * *************** *** 32,39 **** class thumbnailsViewer; class QTabWidget; ! class QListView; class QHBoxLayout; class QVBoxLayout; class QGridLayout; /** --- 32,42 ---- class thumbnailsViewer; class QTabWidget; ! class KListView; ! class KIconView; ! class QFrame; class QHBoxLayout; class QVBoxLayout; class QGridLayout; + class QTabWidget; /** *************** *** 64,68 **** KPopupMenu *mnuEdit; ///< The Edit menu KPopupMenu *mnuHelp; ///< The Help menu. Auto-generated via KDE's ! private: /** * Creates the menus on the main application window. --- 67,78 ---- 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. ! QFrame *frmInfos; ///< The frame for the info box. ! QTabWidget *tabs; ///< The main tab widget. ! QWidget *tabThumbnailViewer; ///< Main widget for the first tab (Thumbnail viewer) ! QWidget *tabDetailsView; ///< Main widget for the details view tab. ! thumbnailsViewer *thumbsView; ///< The thumbnail viewer (tab1) ! /** * Creates the menus on the main application window. *************** *** 79,82 **** --- 89,97 ---- */ void createToolbar(); + + /** + * Creates the generic UI (left toolbox + tabs) + */ + void createUI(); public slots: void exit(); |