aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <moorekou@gmail.com>2016-03-29 08:22:43 -0400
committerKen Moore <moorekou@gmail.com>2016-03-29 08:22:43 -0400
commite08a416c47d36b355b3f9667cd6e0f47caabb0b7 (patch)
treee06c090e32c4394c316d654b0585292ed5af50bd
parentRemove the Q_DECL_OVERRIDE tag from the end of the native event filter functi... (diff)
parentMerge pull request #210 from q5sys/master (diff)
downloadlumina-e08a416c47d36b355b3f9667cd6e0f47caabb0b7.tar.gz
lumina-e08a416c47d36b355b3f9667cd6e0f47caabb0b7.tar.bz2
lumina-e08a416c47d36b355b3f9667cd6e0f47caabb0b7.zip
Merge branch 'master' of github.com:pcbsd/lumina
-rw-r--r--lumina-screenshot/MainUI.cpp2
-rw-r--r--lumina-screenshot/MainUI.ui18
2 files changed, 16 insertions, 4 deletions
diff --git a/lumina-screenshot/MainUI.cpp b/lumina-screenshot/MainUI.cpp
index 69c2bfb6..5e1665f5 100644
--- a/lumina-screenshot/MainUI.cpp
+++ b/lumina-screenshot/MainUI.cpp
@@ -55,7 +55,7 @@ void MainUI::setupIcons(){
ui->actionquicksave->setIcon( LXDG::findIcon("document-save","") );
ui->actionQuit->setIcon( LXDG::findIcon("application-exit","") );
ui->actionNew->setIcon( LXDG::findIcon("camera-web","") );
- ui->actionEdit->setIcon( LXDG::findIcon("edit-cut","") );
+ ui->actionEdit->setIcon( LXDG::findIcon("applications-graphics","") );
}
//==============
diff --git a/lumina-screenshot/MainUI.ui b/lumina-screenshot/MainUI.ui
index 233b4574..485bc2c3 100644
--- a/lumina-screenshot/MainUI.ui
+++ b/lumina-screenshot/MainUI.ui
@@ -185,12 +185,21 @@
<string>Quick Save Screenshot</string>
</property>
<property name="shortcut">
- <string>Ctrl+S</string>
+ <string>Ctrl+Shift+S</string>
</property>
</action>
<action name="actionEdit">
<property name="text">
- <string>Crop</string>
+ <string>Edit</string>
+ </property>
+ <property name="toolTip">
+ <string>Edit Screenshot</string>
+ </property>
+ <property name="statusTip">
+ <string>Edit Screenshot</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+E</string>
</property>
</action>
<action name="actionQuit">
@@ -200,13 +209,16 @@
<property name="statusTip">
<string>Quit</string>
</property>
+ <property name="shortcut">
+ <string>Ctrl+Q</string>
+ </property>
</action>
<action name="actionNew">
<property name="text">
<string>Snap</string>
</property>
<property name="statusTip">
- <string>Take new snapshot</string>
+ <string>Take new Screenshot</string>
</property>
</action>
</widget>
bgstack15