[Pikture-cvs] pikture/src main.cpp,1.1.1.1,1.2 pikture.cpp,1.1.1.1,1.2 pikture.h,1.1.1.1,1.2 thumbna
Status: Pre-Alpha
Brought to you by:
ferratus
Menu
▾
▴
[Pikture-cvs] pikture/src main.cpp,1.1.1.1,1.2 pikture.cpp,1.1.1.1,1.2 pikture.h,1.1.1.1,1.2 thumbnail.cpp,1.1.1.1,1.2 thumbnail.h,1.1.1.1,1.2 thumbnailsviewer.cpp,1.1.1.1,1.2 thumbnailsviewer.h,1.1.1.1,1.2
|
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(); |