[Digikam-devel] [Bug 145236] small wishes for the light-table
Gilles Caulier
caulier.gilles at gmail.com
Thu May 10 20:30:29 BST 2007
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
http://bugs.kde.org/show_bug.cgi?id=145236
------- Additional Comments From caulier.gilles gmail com 2007-05-10 21:30 -------
SVN commit 663302 by cgilles:
digikam from trunk : Light Table : added "File/Delete" option in main menu
CCBUGS: 145236
M +10 -10 project/digikam.kdevelop
M +49 -40 utilities/lighttable/lighttablewindow.cpp
M +1 -0 utilities/lighttable/lighttablewindow.h
M +3 -1 utilities/lighttable/lighttablewindowui.rc
--- trunk/extragear/graphics/digikam/project/digikam.kdevelop #663301:663302
@ -12,10 +12,10 @
</keywords>
<projectdirectory>./</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
- <description/>
+ <description></description>
<ignoreparts/>
<projectname>digikam</projectname>
- <defaultencoding/>
+ <defaultencoding></defaultencoding>
</general>
<kdevfileview>
<groups>
@ -75,10 +75,10 @
<general>
<dbgshell>libtool</dbgshell>
<programargs/>
- <gdbpath/>
- <configGdbScript/>
- <runShellScript/>
- <runGdbScript/>
+ <gdbpath></gdbpath>
+ <configGdbScript></configGdbScript>
+ <runShellScript></runShellScript>
+ <runGdbScript></runGdbScript>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
@ -113,12 +113,12 @
<run>
<directoryradio>build</directoryradio>
<customdirectory>/</customdirectory>
- <mainprogram>digikam/digikam/digikam</mainprogram>
- <programargs/>
+ <mainprogram>/home/gilles/Documents/devel/SVN/trunk/graphics/digikam/digikam/digikam</mainprogram>
+ <programargs></programargs>
<terminal>false</terminal>
<autocompile>false</autocompile>
<envvars/>
- <globaldebugarguments/>
+ <globaldebugarguments></globaldebugarguments>
<globalcwd>../digikam</globalcwd>
<useglobalprogram>true</useglobalprogram>
<autoinstall>false</autoinstall>
@ -192,7 +192,7 @
<includePaths>.;</includePaths>
</codecompletion>
<creategettersetter>
- <prefixGet/>
+ <prefixGet></prefixGet>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>
--- trunk/extragear/graphics/digikam/utilities/lighttable/lighttablewindow.cpp #663301:663302
@ -75,43 +75,40 @
LightTableWindowPriv()
{
- fullScreenHideToolBar = true;
- fullScreen = false;
- removeFullScreenButton = false;
- cancelSlideShow = false;
- star0 = 0;
- star1 = 0;
- star2 = 0;
- star3 = 0;
- star4 = 0;
- star5 = 0;
- accelerators = 0;
- leftSidebar = 0;
- rightSidebar = 0;
- previewView = 0;
- barView = 0;
- hSplitter = 0;
- vSplitter = 0;
- syncPreviewAction = 0;
- autoSyncPreviewAction = 0;
- clearListAction = 0;
- setItemLeftAction = 0;
- setItemRightAction = 0;
- removeItemAction = 0;
- fileDeleteAction = 0;
- slideShowAction = 0;
- fullScreenAction = 0;
- fileDeletePermanentlyAction = 0;
- fileDeletePermanentlyDirectlyAction = 0;
- fileTrashDirectlyAction = 0;
- donateMoneyAction = 0;
- zoomFitToWindowAction = 0;
- zoomTo100percents = 0;
- zoomPlusAction = 0;
- zoomMinusAction = 0;
- statusProgressBar = 0;
- leftZoomBar = 0;
- rightZoomBar = 0;
+ fullScreenHideToolBar = true;
+ fullScreen = false;
+ removeFullScreenButton = false;
+ cancelSlideShow = false;
+ star0 = 0;
+ star1 = 0;
+ star2 = 0;
+ star3 = 0;
+ star4 = 0;
+ star5 = 0;
+ accelerators = 0;
+ leftSidebar = 0;
+ rightSidebar = 0;
+ previewView = 0;
+ barView = 0;
+ hSplitter = 0;
+ vSplitter = 0;
+ syncPreviewAction = 0;
+ autoSyncPreviewAction = 0;
+ clearListAction = 0;
+ setItemLeftAction = 0;
+ setItemRightAction = 0;
+ removeItemAction = 0;
+ fileDeleteAction = 0;
+ slideShowAction = 0;
+ fullScreenAction = 0;
+ donateMoneyAction = 0;
+ zoomFitToWindowAction = 0;
+ zoomTo100percents = 0;
+ zoomPlusAction = 0;
+ zoomMinusAction = 0;
+ statusProgressBar = 0;
+ leftZoomBar = 0;
+ rightZoomBar = 0;
}
bool fullScreenHideToolBar;
@ -137,9 +134,6 @
KAction *fileDeleteAction;
KAction *slideShowAction;
KAction *donateMoneyAction;
- KAction *fileDeletePermanentlyAction;
- KAction *fileDeletePermanentlyDirectlyAction;
- KAction *fileTrashDirectlyAction;
KAction *zoomPlusAction;
KAction *zoomMinusAction;
KAction *zoomTo100percents;
@ -394,7 +388,14 @
d->clearListAction = new KAction(i18n("Clear all items"), "editshred",
0, this, SLOT(slotClearItemsList()),
actionCollection(), "lighttable_clearlist");
+ d->clearListAction->setEnabled(false);
+ d->fileDeleteAction = new KAction(i18n("Move to Trash"), "edittrash",
+ Key_Delete,
+ this, SLOT(slotDeleteItem()),
+ actionCollection(), "lighttable_filedelete");
+ d->fileDeleteAction->setEnabled(false);
+
KStdAction::quit(this, SLOT(close()), actionCollection(), "lighttable_exit");
// -- Standard 'View' menu actions ---------------------------------------------
@ -609,6 +610,7 @
d->setItemRightAction->setEnabled(true);
d->removeItemAction->setEnabled(true);
d->clearListAction->setEnabled(true);
+ d->fileDeleteAction->setEnabled(true);
}
else
{
@ -616,6 +618,7 @
d->setItemRightAction->setEnabled(false);
d->removeItemAction->setEnabled(false);
d->clearListAction->setEnabled(false);
+ d->fileDeleteAction->setEnabled(false);
}
d->previewView->checkForSelection(info);
@ -690,6 +693,12 @
d->barView->clear();
}
+void LightTableWindow::slotDeleteItem()
+{
+ if (d->barView->currentItemImageInfo())
+ slotDeleteItem(d->barView->currentItemImageInfo());
+}
+
void LightTableWindow::slotDeleteItem(ImageInfo* info)
{
bool ask = true;
--- trunk/extragear/graphics/digikam/utilities/lighttable/lighttablewindow.h #663301:663302
@ -105,6 +105,7 @
void slotToggleSyncPreview();
void slotEditItem(ImageInfo*);
+ void slotDeleteItem();
void slotDeleteItem(ImageInfo*);
void slotItemSelected(ImageInfo*);
--- trunk/extragear/graphics/digikam/utilities/lighttable/lighttablewindowui.rc #663301:663302
@ -1,5 +1,5 @
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui version="10" name="lighttablewindow" >
+<gui version="11" name="lighttablewindow" >
<MenuBar>
@ -10,6 +10,8 @
<Action name="lighttable_removeitem" />
<Action name="lighttable_clearlist" />
<Separator/>
+ <Action name="lighttable_filedelete" />
+ <Separator/>
<Action name="lighttable_exit" />
</Menu>
More information about the Digikam-devel
mailing list