diff --git a/doc/index.docbook b/doc/index.docbook --- a/doc/index.docbook +++ b/doc/index.docbook @@ -72,7 +72,7 @@ &Shift;Print will take a screenshot of your entire desktop, &ie; all monitors Meta&Shift;Print will take a rectangular region screenshot - You can configure the default save location and filename by starting &spectacle; normally, clicking the downward arrow beside the Save & Exit button, and selecting Preferences from the menu. + You can configure the default save location and filename by starting &spectacle; normally and clicking on the Configure... button and navigating to the Save section The mini command line &krunner; (invoked with &Alt;F2) may also be used to start &spectacle;. @@ -213,16 +213,14 @@ Save & Exit Clicking this button saves the screenshot as a PNG image in your default Pictures folder and immediately exits the application. - - Additionally, if you click the arrow on the right side of the button, a drop-down menu allows you to simply Save the image, save the image with a different filename, location and format (Save As...), Print the image, and configure the default Preferences, such as application preferences and where to save the image by default and what filename to save it as. Configure - Use Save & ExitPreferences to open the configuration dialog. + Use the Configure... button to open the configuration dialog. General diff --git a/src/Gui/KSMainWindow.h b/src/Gui/KSMainWindow.h --- a/src/Gui/KSMainWindow.h +++ b/src/Gui/KSMainWindow.h @@ -74,6 +74,7 @@ QFrame *mDivider; QDialogButtonBox *mDialogButtonBox; QPushButton *mSendToButton; + QToolButton *mConfigureButton; QToolButton *mClipboardButton; QToolButton *mSaveButton; QMenu *mSaveMenu; diff --git a/src/Gui/KSMainWindow.cpp b/src/Gui/KSMainWindow.cpp --- a/src/Gui/KSMainWindow.cpp +++ b/src/Gui/KSMainWindow.cpp @@ -52,6 +52,7 @@ mDivider(new QFrame), mDialogButtonBox(new QDialogButtonBox), mSendToButton(new QPushButton), + mConfigureButton(new QToolButton), mClipboardButton(new QToolButton), mSaveButton(new QToolButton), mSaveMenu(new QMenu), @@ -125,6 +126,13 @@ mDialogButtonBox->setStandardButtons(QDialogButtonBox::Help); + mConfigureButton->setDefaultAction(KStandardAction::preferences(this, SLOT(showPreferencesDialog()), this)); + mConfigureButton->setText(i18n("Configure...")); + mConfigureButton->setToolTip(i18n("Change Spectacle's settings.")); + mConfigureButton->setIcon(QIcon::fromTheme(QStringLiteral("configure"))); + mConfigureButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + mDialogButtonBox->addButton(mConfigureButton, QDialogButtonBox::ActionRole); + KGuiItem::assign(mSendToButton, KGuiItem(i18n("Export Image..."))); mSendToButton->setIcon(QIcon::fromTheme(QStringLiteral("document-share"))); mDialogButtonBox->addButton(mSendToButton, QDialogButtonBox::ActionRole); @@ -217,9 +225,6 @@ // finish off building the menu mSaveMenu->addAction(KStandardAction::print(this, SLOT(showPrintDialog()), this)); - mSaveMenu->addSeparator(); - mSaveMenu->addAction(QIcon::fromTheme(QStringLiteral("applications-system")), i18n("Preferences"), - this, SLOT(showPreferencesDialog())); } // overrides