[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/extragear/graphics/digikam/core/utilities/setup
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2010-12-14 11:33:18
Message-ID: 20101214113318.8380AAC8A7 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1206438 by cgilles:
fix tabs order
M +31 -29 setup.cpp
M +10 -8 setup.h
--- branches/extragear/graphics/digikam/core/utilities/setup/setup.cpp #1206437:1206438
@@ -188,6 +188,26 @@
"<i>Customize the look of the albums list</i></qt>"));
d->page_albumView->setIcon(KIcon("view-list-icons"));
+ d->categoryPage = new SetupCategory();
+ d->page_category = addPage(d->categoryPage, i18n("Album Category"));
+ d->page_category->setHeader(i18n("<qt>Album Category Settings<br/>"
+ "<i>Assign categories to albums used to sort them</i></qt>"));
+ d->page_category->setIcon(KIcon("view-calendar-list"));
+
+ d->tooltipPage = new SetupToolTip();
+ d->page_tooltip = addPage(d->tooltipPage, i18n("Tool-Tip"));
+ d->page_tooltip->setHeader(i18n("<qt>Album Items Tool-Tip Settings<br/>"
+ "<i>Customize information in tool-tips</i></qt>"));
+ d->page_tooltip->setIcon(KIcon("dialog-information"));
+
+/*
+ d->faceTagsPage = new SetupFaceTags();
+ d->page_facetags = addPage(d->faceTagsPage, i18n("People Tags"));
+ d->page_facetags->setHeader(i18n("<qt>People Tags<br/>"
+ "<i>Configure digiKam's face detection and recognition</i></qt>"));
+ d->page_facetags->setIcon(KIcon("face-smile"));
+*/
+
d->metadataPage = new SetupMetadata();
d->page_metadata = addPage(d->metadataPage, i18n("Metadata"));
d->page_metadata->setHeader(i18n("<qt>Embedded Image Information Management<br/>"
@@ -200,6 +220,12 @@
"<i>Manage your collection of metadata templates</i></qt>"));
d->page_template->setIcon(KIcon("user-identity"));
+ d->mimePage = new SetupMime();
+ d->page_mime = addPage(d->mimePage, i18n("MIME Types"));
+ d->page_mime->setHeader(i18n("<qt>Supported File Settings<br/>"
+ "<i>Add new file types to show as album items</i></qt>"));
+ d->page_mime->setIcon(KIcon("system-file-manager"));
+
d->editorPage = new SetupEditor();
d->page_editor = addPage(d->editorPage, i18n("Editor Window"));
d->page_editor->setHeader(i18n("<qt>Image Editor Window Settings<br/>"
@@ -242,24 +268,6 @@
"<i>Customize slideshow settings</i></qt>"));
d->page_slideshow->setIcon(KIcon("view-presentation"));
- d->tooltipPage = new SetupToolTip();
- d->page_tooltip = addPage(d->tooltipPage, i18n("Tool-Tip"));
- d->page_tooltip->setHeader(i18n("<qt>Album Items Tool-Tip Settings<br/>"
- "<i>Customize information in tool-tips</i></qt>"));
- d->page_tooltip->setIcon(KIcon("dialog-information"));
-
- d->mimePage = new SetupMime();
- d->page_mime = addPage(d->mimePage, i18n("MIME Types"));
- d->page_mime->setHeader(i18n("<qt>Supported File Settings<br/>"
- "<i>Add new file types to show as album items</i></qt>"));
- d->page_mime->setIcon(KIcon("system-file-manager"));
-
- d->miscPage = new SetupMisc();
- d->page_misc = addPage(d->miscPage, i18n("Miscellaneous"));
- d->page_misc->setHeader(i18n("<qt>Miscellaneous Settings<br/>"
- "<i>Customize behavior of the other parts of digiKam</i></qt>"));
- d->page_misc->setIcon(KIcon("preferences-other"));
-
d->cameraPage = new SetupCamera();
d->page_camera = addPage(d->cameraPage, i18n("Cameras"));
d->page_camera->setHeader(i18n("<qt>Camera Settings<br/>"
@@ -278,18 +286,12 @@
"<i>Add/Remove and Manage Digikam Scripts</i></qt>"));
d->page_scriptmanager->setIcon(KIcon("application-x-shellscript"));
- d->categoryPage = new SetupCategory();
- d->page_category = addPage(d->categoryPage, i18n("Album Category"));
- d->page_category->setHeader(i18n("<qt>Album Category Settings<br/>"
- "<i>Assign categories to albums used to sort them</i></qt>"));
- d->page_category->setIcon(KIcon("view-calendar-list"));
+ d->miscPage = new SetupMisc();
+ d->page_misc = addPage(d->miscPage, i18n("Miscellaneous"));
+ d->page_misc->setHeader(i18n("<qt>Miscellaneous Settings<br/>"
+ "<i>Customize behavior of the other parts of digiKam</i></qt>"));
+ d->page_misc->setIcon(KIcon("preferences-other"));
- /*d->faceTagsPage = new SetupFaceTags();
- d->page_facetags = addPage(d->faceTagsPage, i18n("People Tags"));
- d->page_facetags->setHeader(i18n("<qt>People Tags<br/>"
- "<i>Configure digiKam's face detection and recognition</i></qt>"));
- d->page_facetags->setIcon(KIcon("face-smile"));*/
-
for (int i = 0; i != SetupPageEnumLast; ++i)
{
KPageWidgetItem* item = d->pageItem((Page)i);
--- branches/extragear/graphics/digikam/core/utilities/setup/setup.h #1206437:1206438
@@ -49,24 +49,24 @@
{
LastPageUsed = -1,
- CollectionsPage = 0,
- DatabasePage,
+ DatabasePage = 0,
+ CollectionsPage,
AlbumViewPage,
CategoryPage,
ToolTipPage,
FaceTagsPage,
- VersioningPage,
MetadataPage,
TemplatePage,
MimePage,
- LightTablePage,
EditorPage,
+ VersioningPage,
DcrawPage,
IOFilesPage,
+ ICCPage,
+ LightTablePage,
SlideshowPage,
- ICCPage,
+ CameraPage,
KipiPluginsPage,
- CameraPage,
ScriptManagerPage,
MiscellaneousPage,
@@ -74,10 +74,12 @@
};
/** Show a setup dialog. The specified page will be selected.
- True is returned if the dialog was closed with Ok. */
+ True is returned if the dialog was closed with Ok.
+ */
static bool exec(Page page=LastPageUsed);
static bool exec(QWidget* parent, Page page=LastPageUsed);
- /** Show a setup dialog. Only the specified page will be available. */
+ /** Show a setup dialog. Only the specified page will be available.
+ */
static bool execSinglePage(Page page);
static bool execSinglePage(QWidget* parent, Page page);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic