From 1255a139b94c3c8ea24d0484a866de392127ec18 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 6 Mar 2014 21:38:35 +0100 Subject: [PATCH] Whatever... --- .../icons/mini-kfaenza/document-export.png | Bin 2066 -> 0 bytes .../icons/mini-kfaenza/document-import.png | Bin 2056 -> 0 bytes src/core/messagesmodel.cpp | 2 - src/gui/formmain.cpp | 13 +++++-- src/gui/formmain.ui | 35 ++++++------------ src/gui/formupdate.cpp | 4 +- 6 files changed, 21 insertions(+), 33 deletions(-) delete mode 100644 resources/graphics/icons/mini-kfaenza/document-export.png delete mode 100644 resources/graphics/icons/mini-kfaenza/document-import.png diff --git a/resources/graphics/icons/mini-kfaenza/document-export.png b/resources/graphics/icons/mini-kfaenza/document-export.png deleted file mode 100644 index 09eaa9f14f6b0b6f3a55f08165b022bd8f3bbcd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2066 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 m`v^58N()).toLocalTime().toString(Qt::DefaultLocaleShortDate); } diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 22488aff8..6562e4461 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -60,6 +60,14 @@ FormMain::FormMain(QWidget *parent) // Establish connections. createConnections(); + // Add these actions to the list of actions of the main window. + // This allows to use actions via shortcuts + // even if main menu is not visible. + // TODO: volba zobrazit/skryt hlavni menu + // bude li menu skryte tak jen v rohu robrazit + // tlacitko s tim menu. + addActions(allActions()); + // Prepare tabs. m_ui->m_tabWidget->initializeTabs(); @@ -79,8 +87,7 @@ QList FormMain::allActions() { QList actions; // Add basic actions. - actions << m_ui->m_actionImport << m_ui->m_actionExport << - m_ui->m_actionSettings << m_ui->m_actionQuit << + actions << m_ui->m_actionSettings << m_ui->m_actionQuit << m_ui->m_actionFullscreen << m_ui->m_actionAboutGuard << m_ui->m_actionSwitchFeedsListVisibility << m_ui->m_actionSwitchMainWindow; @@ -245,8 +252,6 @@ void FormMain::setupIcons() { m_ui->m_actionSettings->setIcon(icon_theme_factory->fromTheme("application-settings")); m_ui->m_actionQuit->setIcon(icon_theme_factory->fromTheme("application-exit")); m_ui->m_actionAboutGuard->setIcon(icon_theme_factory->fromTheme("application-about")); - m_ui->m_actionImport->setIcon(icon_theme_factory->fromTheme("document-import")); - m_ui->m_actionExport->setIcon(icon_theme_factory->fromTheme("document-export")); m_ui->m_actionDefragmentDatabase->setIcon(icon_theme_factory->fromTheme("defragment-database")); // View. diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui index 8c3708617..6c3be2505 100644 --- a/src/gui/formmain.ui +++ b/src/gui/formmain.ui @@ -15,7 +15,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -39,7 +48,7 @@ 0 0 979 - 20 + 21 @@ -139,28 +148,6 @@ - - - &Import - - - Import stuff. - - - Ctrl+Shift+I - - - - - E&xport - - - Export stuff. - - - Ctrl+Shift+E - - &Quit diff --git a/src/gui/formupdate.cpp b/src/gui/formupdate.cpp index e2f087cd3..1e44a2c6b 100755 --- a/src/gui/formupdate.cpp +++ b/src/gui/formupdate.cpp @@ -91,8 +91,6 @@ void FormUpdate::checkForUpdates() { // TODO: Display "update" button if // URL of file for current platform (Windows or OS2) // is available. - // TODO: Tady po stisku update tlacitka se provede - // stazeni archivu do tempu. m_btnUpdate->setEnabled(true); m_btnUpdate->setToolTip(isUpdateForThisSystem() ? tr("Download installation file for your OS.") : @@ -103,7 +101,7 @@ void FormUpdate::checkForUpdates() { m_ui->m_lblStatus->setStatus(WidgetWithStatus::Warning, tr("No new release available."), tr("This release is not newer than\ncurrently installed one.")); - m_btnUpdate->setEnabled(true); + m_btnUpdate->setEnabled(false); m_btnUpdate->setToolTip(tr("No new update available.")); } }