From 79caefb8aabb7e82d7bd4d3600c23b9218165a2b Mon Sep 17 00:00:00 2001 From: nowrep Date: Thu, 26 Jan 2012 16:22:09 +0100 Subject: [PATCH] Don't show "Show menubar" action on Mac OS. Closes #129 - "SuperMenu" button won't be visible on Mac too * there is no need to show it as Menu will always be visible - also made little improvement in Mac theme - updated Portuguese translation --- bin/locale/pt_PT.qm | Bin 92021 -> 93049 bytes bin/themes/mac/main.css | 6 +- src/app/qupzilla.cpp | 77 +++++++++++--------------- src/app/qupzilla.h | 4 +- src/navigation/locationbar.cpp | 4 ++ src/network/qupzillaschemehandler.cpp | 9 +-- src/plugins/webpluginfactory.cpp | 2 +- translations/pt_PT.ts | 20 +++---- 8 files changed, 55 insertions(+), 67 deletions(-) diff --git a/bin/locale/pt_PT.qm b/bin/locale/pt_PT.qm index b7da1072be7e08c21ce121fcba051def95f475d0..31415a8a6862c97f0534018a7634ceb0e8b3e65f 100644 GIT binary patch delta 7655 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 delta 7087 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 Muap0cWik5y0o58^UjP6A diff --git a/bin/themes/mac/main.css b/bin/themes/mac/main.css index d0b12eacf..0b55a2317 100644 --- a/bin/themes/mac/main.css +++ b/bin/themes/mac/main.css @@ -116,8 +116,7 @@ border-width:4; color:black; padding-left: 35px; - padding-bottom: 1px; - padding-top: 0px; + padding-top: -2px; qproperty-fixedheight: 23; } @@ -194,8 +193,7 @@ border-image: url(images/lineedit-bg.png); border-width: 4; padding-left: 35px; - padding-bottom: 1px; - padding-top: 0px; + padding-top: -2px; color:black; qproperty-fixedheight: 23; } diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp index 34a2d95df..30119d7a8 100644 --- a/src/app/qupzilla.cpp +++ b/src/app/qupzilla.cpp @@ -189,14 +189,11 @@ void QupZilla::postLaunch() } } - if (m_tabWidget->getTabBar()->normalTabsCount() <= 0 && - m_startBehaviour != Qz::BW_OtherRestoredWindow) { + if (m_tabWidget->getTabBar()->normalTabsCount() <= 0 && m_startBehaviour != Qz::BW_OtherRestoredWindow) { //Something went really wrong .. add one tab m_tabWidget->addView(m_homepage); } - aboutToShowHistoryMenu(false); - aboutToHideHistoryMenu(); aboutToShowBookmarksMenu(); setUpdatesEnabled(true); @@ -330,9 +327,6 @@ void QupZilla::setupMenu() m_menuTools = new QMenu(tr("&Tools")); m_menuHelp = new QMenu(tr("&Help")); m_menuBookmarks = new Menu(tr("&Bookmarks")); - m_menuHistory = new Menu(tr("Hi&story")); - connect(m_menuHistory, SIGNAL(aboutToShow()), this, SLOT(aboutToShowHistoryMenu())); - connect(m_menuHistory, SIGNAL(aboutToHide()), this, SLOT(aboutToHideHistoryMenu())); connect(m_menuBookmarks, SIGNAL(aboutToShow()), this, SLOT(aboutToShowBookmarksMenu())); connect(m_menuBookmarks, SIGNAL(menuMiddleClicked(Menu*)), this, SLOT(loadFolderBookmarks(Menu*))); connect(m_menuHelp, SIGNAL(aboutToShow()), this, SLOT(aboutToShowHelpMenu())); @@ -393,9 +387,11 @@ void QupZilla::setupMenu() m_actionShowStatusbar = new QAction(tr("Sta&tus Bar"), this); m_actionShowStatusbar->setCheckable(true); connect(m_actionShowStatusbar, SIGNAL(triggered(bool)), this, SLOT(showStatusbar())); +#ifndef Q_WS_MAC m_actionShowMenubar = new QAction(tr("&Menu Bar"), this); m_actionShowMenubar->setCheckable(true); connect(m_actionShowMenubar, SIGNAL(triggered(bool)), this, SLOT(showMenubar())); +#endif m_actionShowFullScreen = new QAction(tr("&Fullscreen"), this); m_actionShowFullScreen->setCheckable(true); m_actionShowFullScreen->setShortcut(QKeySequence("F11")); @@ -421,7 +417,9 @@ void QupZilla::setupMenu() connect(m_actionShowHistorySideBar, SIGNAL(triggered()), this, SLOT(showHistorySideBar())); QMenu* toolbarsMenu = new QMenu(tr("Toolbars")); +#ifndef Q_WS_MAC toolbarsMenu->addAction(m_actionShowMenubar); +#endif toolbarsMenu->addAction(m_actionShowToolbar); toolbarsMenu->addAction(m_actionShowBookmarksToolbar); QMenu* sidebarsMenu = new QMenu(tr("Sidebars")); @@ -447,12 +445,14 @@ void QupZilla::setupMenu() connect(m_menuView, SIGNAL(aboutToShow()), this, SLOT(aboutToShowViewMenu())); connect(m_menuView, SIGNAL(aboutToHide()), this, SLOT(aboutToHideViewMenu())); - menuBar()->addMenu(m_menuHistory); - menuBar()->addMenu(m_menuBookmarks); - menuBar()->addMenu(m_menuTools); - menuBar()->addMenu(m_menuHelp); - - menuBar()->setContextMenuPolicy(Qt::CustomContextMenu); + m_menuHistory = new Menu(tr("Hi&story")); + m_menuHistory->addAction(IconProvider::standardIcon(QStyle::SP_ArrowBack), tr("&Back"), this, SLOT(goBack()))->setShortcut(QKeySequence("Ctrl+Left")); + m_menuHistory->addAction(IconProvider::standardIcon(QStyle::SP_ArrowForward), tr("&Forward"), this, SLOT(goNext()))->setShortcut(QKeySequence("Ctrl+Right")); + m_menuHistory->addAction(IconProvider::fromTheme("go-home"), tr("&Home"), this, SLOT(goHome()))->setShortcut(QKeySequence("Alt+Home")); + m_menuHistory->addAction(QIcon(":/icons/menu/history.png"), tr("Show &All History"), this, SLOT(showHistoryManager()))->setShortcut(QKeySequence("Ctrl+Shift+H")); + m_menuHistory->addSeparator(); + connect(m_menuHistory, SIGNAL(aboutToShow()), this, SLOT(aboutToShowHistoryMenu())); + connect(m_menuHistory, SIGNAL(aboutToHide()), this, SLOT(aboutToHideHistoryMenu())); m_menuClosedTabs = new QMenu(tr("Closed Tabs")); connect(m_menuClosedTabs, SIGNAL(aboutToShow()), this, SLOT(aboutToShowClosedTabsMenu())); @@ -463,6 +463,17 @@ void QupZilla::setupMenu() m_menuHistoryMost = new Menu(tr("Most Visited"), m_menuHistory); connect(m_menuHistoryMost, SIGNAL(aboutToShow()), this, SLOT(aboutToShowHistoryMostMenu())); + m_menuHistory->addMenu(m_menuHistoryRecent); + m_menuHistory->addMenu(m_menuHistoryMost); + m_menuHistory->addMenu(m_menuClosedTabs); + + menuBar()->addMenu(m_menuHistory); + menuBar()->addMenu(m_menuBookmarks); + menuBar()->addMenu(m_menuTools); + menuBar()->addMenu(m_menuHelp); + + menuBar()->setContextMenuPolicy(Qt::CustomContextMenu); + aboutToShowToolsMenu(); aboutToShowHelpMenu(); @@ -494,6 +505,7 @@ void QupZilla::setupMenu() addAction(action); } +#ifndef Q_WS_MAC m_superMenu->addMenu(m_menuFile); m_superMenu->addMenu(m_menuEdit); m_superMenu->addMenu(m_menuView); @@ -501,6 +513,7 @@ void QupZilla::setupMenu() m_superMenu->addMenu(m_menuBookmarks); m_superMenu->addMenu(m_menuTools); m_superMenu->addMenu(m_menuHelp); +#endif } void QupZilla::loadSettings() @@ -540,7 +553,9 @@ void QupZilla::loadSettings() m_navigationBar->setVisible(showNavigationToolbar); menuBar()->setVisible(showMenuBar); +#ifndef Q_WS_MAC m_navigationBar->buttonSuperMenu()->setVisible(!showMenuBar); +#endif m_navigationBar->buttonHome()->setVisible(showHomeIcon); m_navigationBar->buttonBack()->setVisible(showBackForwardIcons); m_navigationBar->buttonNext()->setVisible(showBackForwardIcons); @@ -734,48 +749,18 @@ void QupZilla::aboutToShowBookmarksMenu() m_menuBookmarksAction->setVisible(m_bookmarksToolbar->isVisible()); } -void QupZilla::aboutToShowHistoryMenu(bool loadHistory) +void QupZilla::aboutToShowHistoryMenu() { if (!weView()) { return; } - if (!m_historyMenuChanged) { - if (!m_menuHistory || m_menuHistory->actions().count() < 3) { - return; - } - - m_menuHistory->actions().at(0)->setEnabled(WebHistoryWrapper::canGoBack(weView()->history())); - m_menuHistory->actions().at(1)->setEnabled(WebHistoryWrapper::canGoForward(weView()->history())); - return; - } - m_historyMenuChanged = false; - if (!loadHistory) { - m_historyMenuChanged = true; - } - - m_menuHistory->clear(); - m_menuHistory->addAction(IconProvider::standardIcon(QStyle::SP_ArrowBack), tr("&Back"), this, SLOT(goBack()))->setShortcut(QKeySequence("Ctrl+Left")); - m_menuHistory->addAction(IconProvider::standardIcon(QStyle::SP_ArrowForward), tr("&Forward"), this, SLOT(goNext()))->setShortcut(QKeySequence("Ctrl+Right")); - m_menuHistory->addAction(IconProvider::fromTheme("go-home"), tr("&Home"), this, SLOT(goHome()))->setShortcut(QKeySequence("Alt+Home")); - m_menuHistory->actions().at(0)->setEnabled(WebHistoryWrapper::canGoBack(weView()->history())); m_menuHistory->actions().at(1)->setEnabled(WebHistoryWrapper::canGoForward(weView()->history())); - - m_menuHistory->addAction(QIcon(":/icons/menu/history.png"), tr("Show &All History"), this, SLOT(showHistoryManager()))->setShortcut(QKeySequence("Ctrl+Shift+H")); - m_menuHistory->addSeparator(); - - m_menuHistory->addMenu(m_menuHistoryRecent); - m_menuHistory->addMenu(m_menuHistoryMost); - m_menuHistory->addMenu(m_menuClosedTabs); } void QupZilla::aboutToHideHistoryMenu() { - if (!m_menuHistory || m_menuHistory->actions().count() < 3) { - return; - } - m_menuHistory->actions().at(0)->setEnabled(true); m_menuHistory->actions().at(1)->setEnabled(true); } @@ -902,7 +887,9 @@ void QupZilla::aboutToShowViewMenu() } m_actionShowToolbar->setChecked(m_navigationBar->isVisible()); +#ifndef Q_WS_MAC m_actionShowMenubar->setChecked(menuBar()->isVisible()); +#endif m_actionShowStatusbar->setChecked(statusBar()->isVisible()); m_actionShowBookmarksToolbar->setChecked(m_bookmarksToolbar->isVisible()); @@ -1260,6 +1247,7 @@ void QupZilla::showNavigationToolbar() void QupZilla::showMenubar() { +#ifndef Q_WS_MAC if (!m_navigationBar->isVisible() && !m_actionShowMenubar->isChecked()) { showNavigationToolbar(); } @@ -1269,6 +1257,7 @@ void QupZilla::showMenubar() Settings settings; settings.setValue("Browser-View-Settings/showMenubar", menuBar()->isVisible()); +#endif } void QupZilla::showStatusbar() diff --git a/src/app/qupzilla.h b/src/app/qupzilla.h index e6918f3e5..506ed3e6d 100644 --- a/src/app/qupzilla.h +++ b/src/app/qupzilla.h @@ -154,7 +154,7 @@ private slots: void aboutToShowFileMenu(); void aboutToHideFileMenu(); - void aboutToShowHistoryMenu(bool loadHistory = true); + void aboutToShowHistoryMenu(); void aboutToHideHistoryMenu(); void aboutToShowClosedTabsMenu(); void aboutToShowBookmarksMenu(); @@ -251,7 +251,9 @@ private: QAction* m_actionShowToolbar; QAction* m_actionShowBookmarksToolbar; QAction* m_actionShowStatusbar; +#ifndef Q_WS_MAC QAction* m_actionShowMenubar; +#endif QAction* m_actionShowFullScreen; QAction* m_actionShowBookmarksSideBar; QAction* m_actionShowHistorySideBar; diff --git a/src/navigation/locationbar.cpp b/src/navigation/locationbar.cpp index bc961a769..0d59c72da 100644 --- a/src/navigation/locationbar.cpp +++ b/src/navigation/locationbar.cpp @@ -350,6 +350,10 @@ void LocationBar::focusOutEvent(QFocusEvent* e) setCursorPosition(0); hideGoButton(); + + if (text().trimmed().isEmpty()) { + clear(); + } } void LocationBar::mouseDoubleClickEvent(QMouseEvent* event) diff --git a/src/network/qupzillaschemehandler.cpp b/src/network/qupzillaschemehandler.cpp index 66ec5535c..b425c8812 100644 --- a/src/network/qupzillaschemehandler.cpp +++ b/src/network/qupzillaschemehandler.cpp @@ -23,14 +23,9 @@ #include "speeddial.h" #include "pluginproxy.h" -QString authorString(const QString &name, const QString &mail) -{ - return QString("%1 <%2>").arg(name, mail); -} - QString authorString(const char* name, const QString &mail) { - return authorString(QString::fromUtf8(name), mail); + return QString("%1 <%2>").arg(QString::fromUtf8(name), mail); } QupZillaSchemeHandler::QupZillaSchemeHandler() @@ -202,7 +197,7 @@ QString QupZillaSchemeReply::aboutPage() QString("
%1
%2
").arg(tr("Plugins"), mApp->PLUGINSDIR) + QString("
%1
%2
").arg(tr("Translations"), mApp->TRANSLATIONSDIR)); aPage.replace("%MAIN-DEVELOPER%", tr("Main developer")); - aPage.replace("%MAIN-DEVELOPER-TEXT%", authorString(QupZilla::AUTHOR, "nowrep@gmail.com")); + aPage.replace("%MAIN-DEVELOPER-TEXT%", authorString(QupZilla::AUTHOR.toUtf8(), "nowrep@gmail.com")); aPage.replace("%CONTRIBUTORS%", tr("Contributors")); aPage.replace("%CONTRIBUTORS-TEXT%", authorString("Mladen Pejaković", "pejakm@gmail.com") + "
" + diff --git a/src/plugins/webpluginfactory.cpp b/src/plugins/webpluginfactory.cpp index 74910fe35..063397177 100644 --- a/src/plugins/webpluginfactory.cpp +++ b/src/plugins/webpluginfactory.cpp @@ -99,7 +99,7 @@ QList WebPluginFactory::plugins() const QWebPluginFactory::Plugin plugin; QWebPluginFactory::MimeType mimeType; - mimeType.fileExtensions << QLatin1String("swf"); + mimeType.fileExtensions << "swf"; mimeType.name = "application/x-shockwave-flash"; plugin.name = "ClickToFlashPlugin"; diff --git a/translations/pt_PT.ts b/translations/pt_PT.ts index a296a5e6f..ae2172dac 100644 --- a/translations/pt_PT.ts +++ b/translations/pt_PT.ts @@ -597,7 +597,7 @@ Open link in current &tab - + Abrir ligação no separador a&tual @@ -684,7 +684,7 @@ Open link in current &tab - + Abrir ligação no separador a&tual @@ -977,7 +977,7 @@ Earlier Today - + Hoje Later Today @@ -1526,7 +1526,7 @@ não foi encontrado! Open link in current tab - + Abrir ligação no separador atual @@ -1663,7 +1663,7 @@ não foi encontrado! Open link in current tab - + Abrir ligação no separador atual @@ -2337,7 +2337,7 @@ não foi encontrado! Use current - + Utilizar atual @@ -2357,7 +2357,7 @@ não foi encontrado! Open new tabs after active tab - + Abrir separadores após o atual @@ -3747,7 +3747,7 @@ Adicione as fontes com o ícone RSS existente na barra de navegação, nas pági Open link in current tab - + Abrir ligação no separador atual Open link in actual tab @@ -4928,12 +4928,12 @@ Após adicionar ou remover os caminhos dos certificados, tem que reiniciar o Qup Paste And &Search - + Colar e pr&ocurar Clear All - Apagar tudo + Apagar tudo