From 2295f52f60451b514bcb125c17a9108af8f457a5 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 14 Nov 2010 21:06:54 +0000 Subject: added 'show playlist' and 'show equalizer' hotkeys git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1986 90c681e8-e032-0410-971d-27865f9a5e38 --- src/ui/CMakeLists.txt | 2 - src/ui/actionmanager.cpp | 6 +- src/ui/actionmanager.h | 6 +- src/ui/configdialog.cpp | 2 +- src/ui/display.cpp | 27 ++++++- src/ui/mainwindow.cpp | 68 +++++++++------- src/ui/mainwindow.h | 1 - src/ui/playlist.cpp | 40 +++++----- src/ui/skin.cpp | 9 ++- src/ui/translations/qmmp_cs.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_de.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_es.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_hu.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_it.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_ja.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_lt.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_nl.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_pl_PL.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_pt_BR.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_ru.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_tr.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_uk_UA.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_zh_CN.ts | 159 +++++++++++++++++++++----------------- src/ui/translations/qmmp_zh_TW.ts | 159 +++++++++++++++++++++----------------- src/ui/ui.pro | 2 - src/ui/viewmenu.cpp | 49 ------------ src/ui/viewmenu.h | 45 ----------- 27 files changed, 1418 insertions(+), 1224 deletions(-) delete mode 100644 src/ui/viewmenu.cpp delete mode 100644 src/ui/viewmenu.h (limited to 'src') diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 41f82f9ac..471e26443 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -83,7 +83,6 @@ SET(ui_SRCS popupwidget.cpp popupsettings.cpp windowsystem.cpp - viewmenu.cpp lxdesupport.cpp actionmanager.cpp shortcutitem.cpp @@ -141,7 +140,6 @@ SET(ui_MOC_HDRS popupwidget.h popupsettings.h windowsystem.h - viewmenu.h lxdesupport.h shortcutitem.h actionmanager.h diff --git a/src/ui/actionmanager.cpp b/src/ui/actionmanager.cpp index ef9ebe1ce..c52c4955e 100644 --- a/src/ui/actionmanager.cpp +++ b/src/ui/actionmanager.cpp @@ -50,6 +50,8 @@ ActionManager::ActionManager(QObject *parent) : tr("Ctrl+S")); m_actions[CLEAR_QUEUE] = createAction(tr("&Clear Queue"), "clear_queue", tr("Alt+Q")); //view + m_actions[SHOW_PLAYLIST] = createAction2(tr("Show Playlist"), "show_playlist", tr("Alt+E")); + m_actions[SHOW_EQUALIZER] = createAction2(tr("Show Equalizer"), "show_equalizer", tr("Alt+G")); m_actions[WM_ALLWAYS_ON_TOP] = createAction2(tr("Always on Top"), "always_on_top", ""); m_actions[WM_STICKY] = createAction2(tr("Put on All Workspaces"), "General/always_on_top", ""); m_actions[WM_DOUBLE_SIZE] = createAction2(tr("Double Size"), "double_size", ""); @@ -74,12 +76,8 @@ ActionManager::ActionManager(QObject *parent) : "dialog-information"); m_actions[PL_NEW] = createAction(tr("&New List"), "new_pl", tr("Ctrl+T"), "document-new"); m_actions[PL_CLOSE] = createAction(tr("&Delete List"), "close_pl", tr("Ctrl+W"), "window-close"); - m_actions[PL_LOAD] = createAction(tr("&Load List"), "load_pl", tr("O"), "document-open"); - m_actions[PL_SAVE] = createAction(tr("&Save List"), "save_pl", tr("Shift+S"), "document-save-as"); - - m_actions[PL_SELECT_NEXT] = createAction(tr("&Select Next Playlist"), "next_pl", tr("Ctrl+PgDown"), "go-next"); m_actions[PL_SELECT_PREVIOUS] = createAction(tr("&Select Previous Playlist"), "prev_pl", diff --git a/src/ui/actionmanager.h b/src/ui/actionmanager.h index 3d0bb53cd..33e6302fb 100644 --- a/src/ui/actionmanager.h +++ b/src/ui/actionmanager.h @@ -28,7 +28,8 @@ class QAction; class QSettings; -#define ACTION(type, receiver, member) ActionManager::instance()->use(type, receiver, member) +#define SET_ACTION(type, receiver, member) ActionManager::instance()->use(type, receiver, member) +#define ACTION(type) ActionManager::instance()->action(type) /** @author Ilya Kotov @@ -57,6 +58,9 @@ public: STOP_AFTER_SELECTED, CLEAR_QUEUE, + SHOW_PLAYLIST, + SHOW_EQUALIZER, + WM_ALLWAYS_ON_TOP, WM_STICKY, WM_DOUBLE_SIZE, diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp index eff3dd03f..45888b2b1 100644 --- a/src/ui/configdialog.cpp +++ b/src/ui/configdialog.cpp @@ -347,7 +347,7 @@ void ConfigDialog::loadShortcuts() ui.shortcutTreeWidget->addTopLevelItem(item); //view item = new QTreeWidgetItem (ui.shortcutTreeWidget, QStringList() << tr("View")); - for(int i = ActionManager::WM_ALLWAYS_ON_TOP; i <= ActionManager::WM_DOUBLE_SIZE; ++i) + for(int i = ActionManager::SHOW_PLAYLIST; i <= ActionManager::WM_DOUBLE_SIZE; ++i) new ShortcutItem(item, i); item->setExpanded(true); ui.shortcutTreeWidget->addTopLevelItem(item); diff --git a/src/ui/display.cpp b/src/ui/display.cpp index e86f873ad..d8897d0a4 100644 --- a/src/ui/display.cpp +++ b/src/ui/display.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2008 by Ilya Kotov * + * Copyright (C) 2006-2010 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -39,6 +39,7 @@ #include "balancebar.h" #include "mainwindow.h" #include "timeindicator.h" +#include "actionmanager.h" #include "display.h" MainDisplay::MainDisplay (QWidget *parent) @@ -236,19 +237,37 @@ void MainDisplay::setSampleRate(quint32 rate) { m_freq->display((int) rate/1000); } - +//TODO optimize this connections void MainDisplay::setEQ (QWidget* w) { m_equlizer = w; m_eqButton->setON (m_equlizer->isVisible()); - connect (m_eqButton, SIGNAL (clicked(bool)), m_equlizer, SLOT (setVisible (bool))); - connect (m_equlizer, SIGNAL (closed ()), m_eqButton, SLOT (click())); + ACTION(ActionManager::SHOW_EQUALIZER)->setChecked(m_equlizer->isVisible()); + + connect (ACTION(ActionManager::SHOW_EQUALIZER), SIGNAL(triggered(bool)), + m_equlizer, SLOT (setVisible (bool))); + connect (ACTION(ActionManager::SHOW_EQUALIZER), SIGNAL(triggered(bool)), + m_eqButton, SLOT (setON (bool))); + + connect (m_eqButton, SIGNAL(clicked(bool)), + ACTION(ActionManager::SHOW_EQUALIZER), SLOT(setChecked (bool))); + connect (m_eqButton, SIGNAL(clicked(bool)), m_equlizer, SLOT (setVisible (bool))); + connect (m_equlizer, SIGNAL(closed ()), m_eqButton, SLOT (click())); } void MainDisplay::setPL (QWidget* w) { m_playlist = w; m_plButton->setON (m_playlist->isVisible()); + ACTION(ActionManager::SHOW_PLAYLIST)->setChecked(m_playlist->isVisible()); + + connect (ACTION(ActionManager::SHOW_PLAYLIST), SIGNAL(triggered(bool)), + m_playlist, SLOT (setVisible (bool))); + connect (ACTION(ActionManager::SHOW_PLAYLIST), SIGNAL(triggered(bool)), + m_plButton, SLOT (setON (bool))); + + connect (m_plButton, SIGNAL(clicked(bool)), + ACTION(ActionManager::SHOW_PLAYLIST), SLOT(setChecked (bool))); connect (m_plButton, SIGNAL (clicked (bool)), m_playlist, SLOT (setVisible (bool))); connect (m_playlist, SIGNAL (closed ()), m_plButton, SLOT (click())); } diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 19a897174..5fb0458f9 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -49,7 +49,6 @@ #include "listwidget.h" #include "visualmenu.h" #include "windowsystem.h" -#include "viewmenu.h" #include "actionmanager.h" #include "builtincommandlineoption.h" @@ -63,7 +62,6 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option #endif m_vis = 0; m_update = false; - m_allDesktops = false; m_option_manager = option_manager; setWindowIcon(QIcon(":/32x32/qmmp.png")); setWindowFlags(Qt::Window | Qt::FramelessWindowHint | @@ -279,7 +277,6 @@ void MainWindow::changeEvent (QEvent * event) void MainWindow::readSettings() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - m_allDesktops = settings.value("General/show_on_all_desktops", false).toBool(); if (!m_update) { settings.beginGroup("MainWindow"); @@ -289,8 +286,14 @@ void MainWindow::readSettings() m_lastDir = settings.value("last_dir","/").toString(); //last directory m_startHidden = settings.value("start_hidden", false).toBool(); settings.endGroup(); + if(settings.value("General/always_on_top", false).toBool()) + { + ACTION(ActionManager::WM_ALLWAYS_ON_TOP)->setChecked(true); setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); + } + ACTION(ActionManager::WM_STICKY)->setChecked(settings.value("General/show_on_all_desktops", + false).toBool()); show(); qApp->processEvents(); //visibility @@ -310,7 +313,7 @@ void MainWindow::readSettings() } else { - if(settings.value("General/always_on_top", false).toBool()) + if(ACTION(ActionManager::WM_ALLWAYS_ON_TOP)->isChecked()) { setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); m_playlist->setWindowFlags(m_playlist->windowFlags() | Qt::WindowStaysOnTopHint); @@ -328,7 +331,7 @@ void MainWindow::readSettings() m_equalizer->setVisible(m_display->isEqualizerVisible()); } #ifdef Q_WS_X11 - WindowSystem::changeWinSticky(winId(), m_allDesktops); + WindowSystem::changeWinSticky(winId(), ACTION(ActionManager::WM_STICKY)->isChecked()); #endif //Call setWindowOpacity only if needed double opacity = settings.value("MainWindow/opacity", 1.0).toDouble(); @@ -365,6 +368,9 @@ void MainWindow::writeSettings() settings.setValue("resume_playback", m_core->state() == Qmmp::Playing && settings.value("resume_on_startup", false).toBool()); settings.setValue("resume_playback_time", m_core->totalTime() > 0 ? m_core->elapsed() : 0); + settings.setValue("double_size", ACTION(ActionManager::WM_DOUBLE_SIZE)->isChecked()); + settings.setValue("always_on_top", ACTION(ActionManager::WM_ALLWAYS_ON_TOP)->isChecked()); + settings.setValue("show_on_all_desktops", ACTION(ActionManager::WM_STICKY)->isChecked()); settings.endGroup(); } @@ -396,7 +402,7 @@ void MainWindow::toggleVisibility() showNormal(); } #ifdef Q_WS_X11 - WindowSystem::changeWinSticky(winId(), m_allDesktops); + WindowSystem::changeWinSticky(winId(), ACTION(ActionManager::WM_STICKY)->isChecked()); raise(); #endif } @@ -414,44 +420,52 @@ void MainWindow::toggleVisibility() void MainWindow::createActions() { m_mainMenu = new QMenu(this); - m_mainMenu->addAction(ACTION(ActionManager::PLAY, this, SLOT(play()))); - m_mainMenu->addAction(ACTION(ActionManager::PAUSE, this, SLOT(pause()))); - m_mainMenu->addAction(ACTION(ActionManager::STOP, this, SLOT(stop()))); - m_mainMenu->addAction(ACTION(ActionManager::PREVIOUS, this, SLOT(previous()))); - m_mainMenu->addAction(ACTION(ActionManager::NEXT, this, SLOT(next()))); - m_mainMenu->addAction(ACTION(ActionManager::PLAY_PAUSE, this, SLOT(playPause()))); + m_mainMenu->addAction(SET_ACTION(ActionManager::PLAY, this, SLOT(play()))); + m_mainMenu->addAction(SET_ACTION(ActionManager::PAUSE, this, SLOT(pause()))); + m_mainMenu->addAction(SET_ACTION(ActionManager::STOP, this, SLOT(stop()))); + m_mainMenu->addAction(SET_ACTION(ActionManager::PREVIOUS, this, SLOT(previous()))); + m_mainMenu->addAction(SET_ACTION(ActionManager::NEXT, this, SLOT(next()))); + m_mainMenu->addAction(SET_ACTION(ActionManager::PLAY_PAUSE, this, SLOT(playPause()))); m_mainMenu->addSeparator(); m_mainMenu->addAction(QIcon::fromTheme("go-up"), tr("&Jump To File"), this, SLOT(jumpToFile()), tr("J")); m_mainMenu->addSeparator(); - m_mainMenu->addMenu(new ViewMenu(this)); + QMenu *viewMenu = m_mainMenu->addMenu(tr("View")); + viewMenu->addAction(ACTION(ActionManager::SHOW_PLAYLIST)); + viewMenu->addAction(ACTION(ActionManager::SHOW_EQUALIZER)); + viewMenu->addSeparator(); + viewMenu->addAction(SET_ACTION(ActionManager::WM_ALLWAYS_ON_TOP, this, SLOT(updateSettings()))); + viewMenu->addAction(SET_ACTION(ActionManager::WM_STICKY, this, SLOT(updateSettings()))); + viewMenu->addAction(SET_ACTION(ActionManager::WM_DOUBLE_SIZE, this, SLOT(updateSettings()))); QMenu *plMenu = m_mainMenu->addMenu(tr("Playlist")); - plMenu->addAction(ACTION(ActionManager::REPEAT_ALL, m_pl_manager, SLOT(setRepeatableList(bool)))); - plMenu->addAction(ACTION(ActionManager::REPEAT_TRACK, m_player, SLOT(setRepeatable(bool)))); - plMenu->addAction(ACTION(ActionManager::SHUFFLE, m_pl_manager, SLOT(setShuffle(bool)))); - plMenu->addAction(ACTION(ActionManager::NO_PL_ADVANCE, m_player, SLOT(setNoPlaylistAdvance(bool)))); - plMenu->addAction(ACTION(ActionManager::STOP_AFTER_SELECTED, m_pl_manager, SLOT(stopAfterSelected()))); - plMenu->addAction(ACTION(ActionManager::CLEAR_QUEUE, m_pl_manager, SLOT(clearQueue()))); + plMenu->addAction(SET_ACTION(ActionManager::REPEAT_ALL, m_pl_manager, SLOT(setRepeatableList(bool)))); + plMenu->addAction(SET_ACTION(ActionManager::REPEAT_TRACK, m_player, SLOT(setRepeatable(bool)))); + plMenu->addAction(SET_ACTION(ActionManager::SHUFFLE, m_pl_manager, SLOT(setShuffle(bool)))); + plMenu->addAction(SET_ACTION(ActionManager::NO_PL_ADVANCE, m_player, + SLOT(setNoPlaylistAdvance(bool)))); + plMenu->addAction(SET_ACTION(ActionManager::STOP_AFTER_SELECTED, m_pl_manager, + SLOT(stopAfterSelected()))); + plMenu->addAction(SET_ACTION(ActionManager::CLEAR_QUEUE, m_pl_manager, SLOT(clearQueue()))); connect(m_pl_manager, SIGNAL(repeatableListChanged(bool)), - ActionManager::instance()->action(ActionManager::REPEAT_ALL), SLOT(setChecked(bool))); + ACTION(ActionManager::REPEAT_ALL), SLOT(setChecked(bool))); connect(m_player, SIGNAL (repeatableChanged(bool)), - ActionManager::instance()->action(ActionManager::REPEAT_TRACK), SLOT(setChecked(bool))); + ACTION(ActionManager::REPEAT_TRACK), SLOT(setChecked(bool))); connect(m_player, SIGNAL (noPlaylistAdvanceChanged(bool)), - ActionManager::instance()->action(ActionManager::NO_PL_ADVANCE), SLOT(setChecked(bool))); + ACTION(ActionManager::NO_PL_ADVANCE), SLOT(setChecked(bool))); connect(m_pl_manager, SIGNAL(shuffleChanged(bool)), - ActionManager::instance()->action(ActionManager::SHUFFLE), SLOT(setChecked(bool))); + ACTION(ActionManager::SHUFFLE), SLOT(setChecked(bool))); m_visMenu = new VisualMenu(this); m_mainMenu->addMenu(m_visMenu); m_mainMenu->addMenu(m_generalHandler->createMenu(GeneralHandler::TOOLS_MENU, tr("Tools"), this)); m_mainMenu->addSeparator(); - m_mainMenu->addAction(ACTION(ActionManager::SETTINGS, this, SLOT(showSettings()))); + m_mainMenu->addAction(SET_ACTION(ActionManager::SETTINGS, this, SLOT(showSettings()))); m_mainMenu->addSeparator(); - m_mainMenu->addAction(ACTION(ActionManager::ABOUT, this, SLOT(about()))); - m_mainMenu->addAction(ACTION(ActionManager::ABOUT_QT, qApp, SLOT(aboutQt()))); + m_mainMenu->addAction(SET_ACTION(ActionManager::ABOUT, this, SLOT(about()))); + m_mainMenu->addAction(SET_ACTION(ActionManager::ABOUT_QT, qApp, SLOT(aboutQt()))); m_mainMenu->addSeparator(); - m_mainMenu->addAction(ACTION(ActionManager::QUIT, this, SLOT(close()))); + m_mainMenu->addAction(SET_ACTION(ActionManager::QUIT, this, SLOT(close()))); QAction* forward = new QAction(this); forward->setShortcut(QKeySequence(Qt::Key_Right)); diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index f0bbaf707..5d3f15c62 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -115,7 +115,6 @@ private: MainVisual *m_vis; QString m_lastDir; bool m_update; - bool m_allDesktops; Skin *m_skin; JumpToTrackDialog* m_jumpDialog; bool m_hideOnClose, m_startHidden; diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp index 5162ac884..dce6ee47a 100644 --- a/src/ui/playlist.cpp +++ b/src/ui/playlist.cpp @@ -183,21 +183,21 @@ void PlayList::createMenus() void PlayList::createActions() { //add menu - m_addMenu->addAction(ACTION(ActionManager::PL_ADD_FILE, parent(), SLOT(addFile()))); - m_addMenu->addAction(ACTION(ActionManager::PL_ADD_DIRECTORY, parent(), SLOT(addDir()))); - m_addMenu->addAction(ACTION(ActionManager::PL_ADD_URL, parent(), SLOT(addUrl()))); + m_addMenu->addAction(SET_ACTION(ActionManager::PL_ADD_FILE, parent(), SLOT(addFile()))); + m_addMenu->addAction(SET_ACTION(ActionManager::PL_ADD_DIRECTORY, parent(), SLOT(addDir()))); + m_addMenu->addAction(SET_ACTION(ActionManager::PL_ADD_URL, parent(), SLOT(addUrl()))); //sub menu - m_subMenu->addAction(ACTION(ActionManager::PL_REMOVE_SELECTED, m_pl_manager, SLOT(removeSelected()))); - m_subMenu->addAction(ACTION(ActionManager::PL_REMOVE_ALL, m_pl_manager, SLOT(clear()))); - m_subMenu->addAction(ACTION(ActionManager::PL_REMOVE_UNSELECTED, m_pl_manager, + m_subMenu->addAction(SET_ACTION(ActionManager::PL_REMOVE_SELECTED, m_pl_manager, SLOT(removeSelected()))); + m_subMenu->addAction(SET_ACTION(ActionManager::PL_REMOVE_ALL, m_pl_manager, SLOT(clear()))); + m_subMenu->addAction(SET_ACTION(ActionManager::PL_REMOVE_UNSELECTED, m_pl_manager, SLOT(removeUnselected()))); m_subMenu->addSeparator(); - m_subMenu->addAction(ACTION(ActionManager::PL_REMOVE_INVALID, m_pl_manager, + m_subMenu->addAction(SET_ACTION(ActionManager::PL_REMOVE_INVALID, m_pl_manager, SLOT(removeInvalidItems()))); - m_subMenu->addAction(ACTION(ActionManager::PL_REMOVE_DUPLICATES, m_pl_manager, + m_subMenu->addAction(SET_ACTION(ActionManager::PL_REMOVE_DUPLICATES, m_pl_manager, SLOT(removeDuplicates()))); //sort menu - m_sortMenu->addAction(ACTION(ActionManager::PL_SHOW_INFO, m_pl_manager, SLOT (showDetails ()))); + m_sortMenu->addAction(SET_ACTION(ActionManager::PL_SHOW_INFO, m_pl_manager, SLOT (showDetails ()))); m_sortMenu->addAction (ActionManager::instance()->action(ActionManager::PL_SHOW_INFO)); m_sortMenu->addSeparator(); @@ -282,26 +282,26 @@ void PlayList::createActions() m_listWidget->menu()->addMenu(GeneralHandler::instance()->createMenu(GeneralHandler::PLAYLIST_MENU, tr("Actions"), this)); m_listWidget->menu()->addSeparator(); - m_listWidget->menu()->addAction(ACTION(ActionManager::PL_ENQUEUE, m_pl_manager, SLOT(addToQueue()))); + m_listWidget->menu()->addAction(SET_ACTION(ActionManager::PL_ENQUEUE, m_pl_manager, SLOT(addToQueue()))); //select menu - m_selectMenu->addAction(ACTION(ActionManager::PL_INVERT_SELECTION, m_pl_manager, + m_selectMenu->addAction(SET_ACTION(ActionManager::PL_INVERT_SELECTION, m_pl_manager, SLOT(invertSelection ()))); m_selectMenu->addSeparator(); - m_selectMenu->addAction(ACTION(ActionManager::PL_CLEAR_SELECTION, m_pl_manager, + m_selectMenu->addAction(SET_ACTION(ActionManager::PL_CLEAR_SELECTION, m_pl_manager, SLOT(clearSelection ()))); - m_selectMenu->addAction(ACTION(ActionManager::PL_SELECT_ALL, m_pl_manager, SLOT(selectAll()))); + m_selectMenu->addAction(SET_ACTION(ActionManager::PL_SELECT_ALL, m_pl_manager, SLOT(selectAll()))); //Playlist Menu - m_playlistMenu->addAction(ACTION(ActionManager::PL_NEW, m_pl_manager, SLOT(createPlayList()))); - m_playlistMenu->addAction(ACTION(ActionManager::PL_CLOSE, this, SLOT(deletePlaylist()))); + m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_NEW, m_pl_manager, SLOT(createPlayList()))); + m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_CLOSE, this, SLOT(deletePlaylist()))); m_playlistMenu->addSeparator(); - m_playlistMenu->addAction(ACTION(ActionManager::PL_LOAD, this, SIGNAL(loadPlaylist()))); - m_playlistMenu->addAction(ACTION(ActionManager::PL_SAVE, this, SIGNAL(savePlaylist()))); + m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_LOAD, this, SIGNAL(loadPlaylist()))); + m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_SAVE, this, SIGNAL(savePlaylist()))); m_playlistMenu->addSeparator(); - m_playlistMenu->addAction(ACTION(ActionManager::PL_SELECT_NEXT, m_pl_manager, + m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_SELECT_NEXT, m_pl_manager, SLOT(selectNextPlayList()))); - m_playlistMenu->addAction(ACTION(ActionManager::PL_SELECT_PREVIOUS, m_pl_manager, + m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_SELECT_PREVIOUS, m_pl_manager, SLOT(selectPreviousPlayList()))); - m_playlistMenu->addAction(ACTION(ActionManager::PL_SHOW_MANAGER, this, SLOT(showPlayLists()))); + m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_SHOW_MANAGER, this, SLOT(showPlayLists()))); Dock::instance()->addActions (m_addMenu->actions()); Dock::instance()->addActions (m_subMenu->actions()); Dock::instance()->addActions (m_sortMenu->actions()); diff --git a/src/ui/skin.cpp b/src/ui/skin.cpp index 35c01ef2a..b0cba8a1d 100644 --- a/src/ui/skin.cpp +++ b/src/ui/skin.cpp @@ -28,8 +28,9 @@ #include #include #include - +#include #include +#include #include "skin.h" #include "cursorimage.h" @@ -65,6 +66,8 @@ Skin::Skin (QObject *parent) : QObject (parent) QString path = settings.value("skin_path","").toString(); if (path.isEmpty() || !QDir(path).exists ()) path = ":/default"; + m_double_size = settings.value("General/double_size", false).toBool(); + ACTION(ActionManager::WM_DOUBLE_SIZE)->setChecked(m_double_size); setSkin (QDir::cleanPath(path)); /* skin directory */ QDir skinDir(QDir::homePath()+"/.qmmp"); @@ -78,7 +81,7 @@ void Skin::setSkin (const QString& path) { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_use_cursors = settings.value("General/skin_cursors", false).toBool(); - m_double_size = settings.value("General/double_size", false).toBool(); + m_double_size = ACTION(ActionManager::WM_DOUBLE_SIZE)->isChecked(); settings.setValue("skin_path",path); qDebug ("Skin: using %s",qPrintable(path)); m_skin_dir = QDir (path); @@ -207,7 +210,7 @@ void Skin::loadCursors() cursors[CUR_WSMIN] = createCursor(getPath("wsmin")); cursors[CUR_WSWINBUT] = createCursor(getPath("wswinbut")); } - + void Skin::loadButtons() { diff --git a/src/ui/translations/qmmp_cs.ts b/src/ui/translations/qmmp_cs.ts index 32975a87d..80eeee92e 100644 --- a/src/ui/translations/qmmp_cs.ts +++ b/src/ui/translations/qmmp_cs.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File Přidat &soubor - + F F - + &Add Directory Přidat &adresář - + D D - + &Add Url Přidat &URL - + U U - + &Remove Selected &Odstranit vybrané - + Del Del - + &Remove All Odstranit &vše - + &Remove Unselected Odstranit &nevybrané - + Remove unavailable files Odstranit nedostupné soubory - + Remove duplicates Odstranit duplicity - + &Queue Toggle - + Q Q - + Invert Selection Invertovat výběr - + &Select None &Zrušit výběr - + &Select All &Vybrat vše - + Ctrl+A Ctrl+A - + &View Track Details Zobrazit &informace o skladbě - + Alt+I Alt+I - + &New List &Nový seznam - + Ctrl+T Ctrl+T - + &Delete List O&dstranit seznam - + Ctrl+W Ctrl+W - + &Load List Načíst &seznam - + O O @@ -377,62 +397,62 @@ Shift+S - + &Select Next Playlist Vybrat další &seznam skladeb - + Ctrl+PgDown Ctrl+PgDown - + &Select Previous Playlist Vybrat předchozí &seznam skladeb - + Ctrl+PgUp Ctrl+PgUp - + &Show Playlists Zobrazit &seznamy skladeb - + P P - + &Settings &Nastavení - + Ctrl+P Ctrl+P - + &About O &aplikaci - + &About Qt O knihovně &Qt - + &Exit U&končit - + Ctrl+Q Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous Předchozí - + Play Přehrát - + Pause Pozastavit - + Stop Zastavit - + Next Další - + Add file Přidat soubor - + Equalizer Ekvalizér - + Playlist Seznam skladeb - + Repeat playlist Opakovat seznam skladeb - + Shuffle Zamíchat - + Volume Hlasitost - + Balance Vyvážení @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory Výběr adresáře - + Select one or more files to open Vyberte jeden či více souborů k otevření - + &Jump To File Přeskočit na soubo&r - + J J - + + View + Zobrazení + + + Playlist Seznam skladeb - - + + Playlist Files Seznamy skladeb - + Open Playlist Načíst seznam skladeb - + Save Playlist Uložit seznam skladeb - + All Supported Bitstreams Všechny podporované formáty - + Tools Nástroje @@ -1744,14 +1769,6 @@ Automaticky rolovat název skladby - - ViewMenu - - - View - Zobrazení - - VisualMenu diff --git a/src/ui/translations/qmmp_de.ts b/src/ui/translations/qmmp_de.ts index 2c703ad6d..5608d4cf9 100644 --- a/src/ui/translations/qmmp_de.ts +++ b/src/ui/translations/qmmp_de.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File &Datei hinzufügen - + F F - + &Add Directory &Verzeichnis hinzufügen - + D D - + &Add Url &URL hinzufügen - + U U - + &Remove Selected &Ausgewählte entfernen - + Del Entf - + &Remove All Alle &entfernen - + &Remove Unselected &Nicht ausgewählte entfernen - + Remove unavailable files Nichtverfügbare Dateien entfernen - + Remove duplicates Duplikate entfernen - + &Queue Toggle - + Q Q - + Invert Selection Auswahl umkehren - + &Select None &Auswahl aufheben - + &Select All Alle aus&wählen - + Ctrl+A Strg+A - + &View Track Details &Titeldetails anzeigen - + Alt+I Alt+I - + &New List &Neue Wiedergabeliste - + Ctrl+T Strg+T - + &Delete List &Liste löschen - + Ctrl+W Strg+W - + &Load List Wiedergabeliste &laden - + O O @@ -377,62 +397,62 @@ Umschalt+S - + &Select Next Playlist - + Ctrl+PgDown Strg+Bild ab - + &Select Previous Playlist Vorherige Wiedergabeli&ste auswählen - + Ctrl+PgUp Strg+Bild auf - + &Show Playlists Wiedergabeli&sten anzeigen - + P P - + &Settings &Einstellungen - + Ctrl+P Strg+P - + &About Ü&ber - + &About Qt Übe&r Qt - + &Exit Be&enden - + Ctrl+Q Strg+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous Vorheriger Titel - + Play Wiedergabe - + Pause Pause - + Stop Stopp - + Next Nächster Titel - + Add file Datei hinzufügen - + Equalizer Equalizer - + Playlist Wiedergabeliste - + Repeat playlist Wiedergabeliste wiederholen - + Shuffle Zufallswiedergabe - + Volume Lautstärke - + Balance Balance @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory Verzeichnis wählen - + Select one or more files to open Dateien hinzufügen - + &Jump To File Springe zu &Titel - + J J - + + View + Ansicht + + + Playlist Wiedergabeliste - - + + Playlist Files Wiedergabelisten - + Open Playlist Wiedergabeliste öffnen - + Save Playlist Wiedergabeliste speichern - + All Supported Bitstreams Alle unterstützten Formate - + Tools Werkzeuge @@ -1744,14 +1769,6 @@ Automatischer Bildlauf des Titelnamens - - ViewMenu - - - View - Ansicht - - VisualMenu diff --git a/src/ui/translations/qmmp_es.ts b/src/ui/translations/qmmp_es.ts index cd0f94005..09cdee8a1 100644 --- a/src/ui/translations/qmmp_es.ts +++ b/src/ui/translations/qmmp_es.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File &Añadir archivo - + F F - + &Add Directory &Añadir directorio - + D D - + &Add Url &Añadir URL - + U U - + &Remove Selected &Eliminar los seleccionados - + Del Del - + &Remove All &Eliminar todo - + &Remove Unselected &Eliminar los no seleccionados - + Remove unavailable files Eliminar los archivos no disponibles - + Remove duplicates Eliminar los duplicados - + &Queue Toggle - + Q Q - + Invert Selection Invertir la selección - + &Select None &No seleccionar nada - + &Select All &Seleccionar todo - + Ctrl+A Ctrl+A - + &View Track Details &Ver detalles de la pista - + Alt+I Alt+I - + &New List &Nueva lista - + Ctrl+T Ctrl+T - + &Delete List &Borrar lista - + Ctrl+W Ctrl+W - + &Load List &Cargar lista - + O O @@ -377,62 +397,62 @@ Shift+S - + &Select Next Playlist &Seleccionar la lista siguiente - + Ctrl+PgDown Ctrl+PgDown - + &Select Previous Playlist &Seleccionar la lista anterior - + Ctrl+PgUp Ctrl+PgUp - + &Show Playlists &Mostrar las listas - + P P - + &Settings &Configuración - + Ctrl+P Ctrl+P - + &About &Acerca de - + &About Qt &Acerca de Qt - + &Exit &Salir - + Ctrl+Q Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous Anterior - + Play Reproducir - + Pause Pausar - + Stop Detener - + Next Siguiente - + Add file Añadir archivo - + Equalizer Ecualizador - + Playlist Lista de reproducción - + Repeat playlist Repetir la lista de reproducción - + Shuffle Revolver - + Volume Volumen - + Balance Balance @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory Seleccione un directorio - + Select one or more files to open Seleccione uno o más archivos para abrir - + &Jump To File &Saltar a archivo - + J J - + + View + Ver + + + Playlist Lista de reproducción - + Open Playlist Abrir la lista de reproducción - + Save Playlist Guardar la lista de reproducción - - + + Playlist Files Archivos a reproducir - + All Supported Bitstreams Todos los flujos soportados - + Tools Herramientas @@ -1744,14 +1769,6 @@ Autodesplazar el nombre de la canción - - ViewMenu - - - View - Ver - - VisualMenu diff --git a/src/ui/translations/qmmp_hu.ts b/src/ui/translations/qmmp_hu.ts index f025ce6a8..679e9fb63 100644 --- a/src/ui/translations/qmmp_hu.ts +++ b/src/ui/translations/qmmp_hu.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File &Fájl hozzáadása - + F F - + &Add Directory &Könyvtár hazááadása - + D D - + &Add Url &Url hozzáadása - + U U - + &Remove Selected &Megjelöltek eltávolítása - + Del Del - + &Remove All &Összes eltávolítása - + &Remove Unselected &Jelöletlenek eltávolítása - + Remove unavailable files Elérhetetlen fájlok eltávolítása - + Remove duplicates Duplikációk eltávolítása - + &Queue Toggle - + Q Q - + Invert Selection Fordított kijelölés - + &Select None &Kijelölés megszűntetése - + &Select All &Összes kijelölése - + Ctrl+A Ctrl+A - + &View Track Details Szám adatainak &megnézése - + Alt+I Alt+I - + &New List &Új lista - + Ctrl+T Ctrl+T - + &Delete List &Lista törlése - + Ctrl+W Ctrl+W - + &Load List &Lista betöltése - + O O @@ -377,62 +397,62 @@ Shift+S - + &Select Next Playlist &Következő lista választása - + Ctrl+PgDown Ctrl+PgDown - + &Select Previous Playlist &Előző lista választása - + Ctrl+PgUp Ctrl+PgUp - + &Show Playlists &Lejátszási lista mutatása - + P P - + &Settings &Beállítások - + Ctrl+P Ctrl+P - + &About &Névjegy - + &About Qt N&évjegy: Qt - + &Exit &Kilépés - + Ctrl+Q Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous Előző - + Play Lejátszás - + Pause Szünet - + Stop Megállít - + Next Következő - + Add file Fájl hozzáadása - + Equalizer Hangszínszabályzó - + Playlist Lejátszási lista - + Repeat playlist Lista ismétlése - + Shuffle Véletlenszerű - + Volume Hangerő - + Balance Egyensúly @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory Válassz egy könyvtárat - + All Supported Bitstreams Minden támogatott bitráta - + Select one or more files to open Válassz egy vagy több fájlat megnyitásra - + Playlist Lejátszási lista - + &Jump To File &Ugrás fájlra - + J J - + + View + Megnéz + + + Tools Eszközök - - + + Playlist Files Lejátszási lista fájl - + Open Playlist Lista megnyitása - + Save Playlist Lista mentése @@ -1744,14 +1769,6 @@ Töltés: - - ViewMenu - - - View - Megnéz - - VisualMenu diff --git a/src/ui/translations/qmmp_it.ts b/src/ui/translations/qmmp_it.ts index 01327bda2..7c818be01 100644 --- a/src/ui/translations/qmmp_it.ts +++ b/src/ui/translations/qmmp_it.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File &Aggiungi brani - + F F - + &Add Directory &Aggiungi cartelle - + D D - + &Add Url &Aggiungi URL - + U U - + &Remove Selected &Elimina la selezione - + Del Canc - + &Remove All &Elimina tutto - + &Remove Unselected &Elimina i non selezionati - + Remove unavailable files Rimuovi files non disponibili - + Remove duplicates Rimuovi duplicati - + &Queue Toggle - + Q Q - + Invert Selection Inverti la selezione - + &Select None &Non scegliere alcun brano - + &Select All &Seleziona tutto - + Ctrl+A Ctrl+A - + &View Track Details &Dettagli della traccia - + Alt+I Alt+I - + &New List &Nuova lista - + Ctrl+T Ctrl+T - + &Delete List &Cancella lista - + Ctrl+W Ctrl+W - + &Load List &Carica lista - + O O @@ -377,62 +397,62 @@ Shift+S - + &Select Next Playlist &Seleziona la successiva lista esecuzione brani - + Ctrl+PgDown Ctrl+PgDown - + &Select Previous Playlist &Seleziona la rpecedente lista esecuzione brani - + Ctrl+PgUp Ctrl+PgUp - + &Show Playlists Mostra lista esecuzione brani - + P P - + &Settings &Configurazione - + Ctrl+P Ctrl+P - + &About &Informazioni - + &About Qt &Informazioni su Qt - + &Exit &Esci - + Ctrl+Q Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous Brano precedente - + Play Esegui - + Pause Sospendi - + Stop Ferma - + Next Brano successivo - + Add file Aggiungi brani - + Equalizer Equalizzatore - + Playlist Lista brani - + Repeat playlist Ripeti la lista brani - + Shuffle Ordine casuale - + Volume Volume - + Balance Bilanciamento @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory Scegliere una cartella - + Select one or more files to open Seleziona uno o più brani da aprire - + &Jump To File &Vai al brano - + J J - + + View + + + + Playlist - + Open Playlist Apri lista di brani - + Save Playlist Salva lista di brani - - + + Playlist Files Brani della lista - + All Supported Bitstreams Elenco di tutti i tipi di flusso accettati - + Tools Strumenti @@ -1744,14 +1769,6 @@ Scorrimento automatico del titolo del brano - - ViewMenu - - - View - - - VisualMenu diff --git a/src/ui/translations/qmmp_ja.ts b/src/ui/translations/qmmp_ja.ts index 74394ac95..9c4a3588c 100644 --- a/src/ui/translations/qmmp_ja.ts +++ b/src/ui/translations/qmmp_ja.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File ファイルを追加(&F) - + F F - + &Add Directory ディレクトリを追加(&D) - + D D - + &Add Url URLを追加(&U) - + U U - + &Remove Selected 選択したものを除去(&V) - + Del Delele - + &Remove All すべて除去(&M) - + &Remove Unselected 選択外のものを除去(&N) - + Remove unavailable files 無効なファイルを除去 - + Remove duplicates 重複分を除去 - + &Queue Toggle - + Q Q - + Invert Selection 選択範囲を反転 - + &Select None 選択を解除(&N) - + &Select All すべて選択(&E) - + Ctrl+A Ctrl+A - + &View Track Details トラックの詳細を表示(&D) - + Alt+I Alt+I - + &New List 新規リスト(&W) - + Ctrl+T Ctrl+T - + &Delete List リストを削除(&D) - + Ctrl+W Ctrl+W - + &Load List リストを読込(&L) - + O O @@ -377,62 +397,62 @@ Shift+S - + &Select Next Playlist 次のプレイリストを選択(&N) - + Ctrl+PgDown Ctrl+PgDown - + &Select Previous Playlist 前のプレイリストを選択(&P) - + Ctrl+PgUp Ctrl+PgUp - + &Show Playlists プレイリストを表示(&H) - + P P - + &Settings 設定(&S) - + Ctrl+P Ctrl+P - + &About QMMPについて(&A) - + &About Qt Qtについて(&Q) - + &Exit 終了(&X) - + Ctrl+Q Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous 前の曲 - + Play 再生 - + Pause 一時停止 - + Stop 終止 - + Next 次の曲 - + Add file ファイルを追加 - + Equalizer イコライザ - + Playlist プレイリスト - + Repeat playlist プレイリストを繰り返し - + Shuffle シャッフル - + Volume 音量 - + Balance バランス @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory ディレクトリを選択 - + All Supported Bitstreams サポート対象のすべてのデジタル録音物 - + Select one or more files to open 開きたいファイルを選ぶ (複数可) - + Playlist プレイリスト - + &Jump To File ファイルを指定して即刻再生(&J) - + J J - + + View + + + + Tools ツール - - + + Playlist Files プレイリストファイル - + Open Playlist プレイリストを開く - + Save Playlist プレイリストを保存 @@ -1744,14 +1769,6 @@ 先読み: - - ViewMenu - - - View - 表示 - - VisualMenu diff --git a/src/ui/translations/qmmp_lt.ts b/src/ui/translations/qmmp_lt.ts index 898fe95b5..dd4e9921b 100644 --- a/src/ui/translations/qmmp_lt.ts +++ b/src/ui/translations/qmmp_lt.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File &Pridėti bylą - + F - + &Add Directory &Pridėti aplanką - + D - + &Add Url &Pridėti interneto adresą - + U - + &Remove Selected &Pašalinti pasirinktus - + Del - + &Remove All &Pašalinti visus - + &Remove Unselected &Pašalinti NEpasirinktus - + Remove unavailable files Pašalinti neesamas bylas - + Remove duplicates Pašalinti besidubliuojančius pavadinimus - + &Queue Toggle - + Q - + Invert Selection Pasirinkti visus, išskyrus pažymėtą - + &Select None &Nepasirinkti nei vieno - + &Select All &Pasirinkti visus - + Ctrl+A - + &View Track Details &Takelio informacija - + Alt+I - + &New List &Naujas sąrašas - + Ctrl+T - + &Delete List &Pašalinti sąrašą - + Ctrl+W - + &Load List &Įkelti sąrašą - + O @@ -377,62 +397,62 @@ - + &Select Next Playlist &Pasirinkti sekantį grojaraštį - + Ctrl+PgDown - + &Select Previous Playlist &Pasirinkti ankstesnį grojaraštį - + Ctrl+PgUp - + &Show Playlists &Rodyti grojaraščius - + P - + &Settings &Nustatymai - + Ctrl+P - + &About &Apie - + &About Qt &Apie Qt - + &Exit &Išeiti - + Ctrl+Q @@ -1130,62 +1150,62 @@ MainDisplay - + Previous Ankstesnis - + Play Groti - + Pause Pristabdyti - + Stop Sustoti - + Next Sekantis - + Add file Pridėti bylą - + Equalizer Glotintuvas - + Playlist Grojaraštis - + Repeat playlist Gartoti grojaraštį - + Shuffle Atsitiktine tvarka - + Volume Garsumas - + Balance Balansas @@ -1326,53 +1346,58 @@ MainWindow - + Choose a directory Pasirinkite aplanką - + Select one or more files to open Pasirinkite vieną ar kelias bylas atvėrimui - + &Jump To File &Pereiti prie bylos - + J - + + View + Rodyti + + + Playlist Grojaraštis - + Open Playlist Atverti grojaraštį - + Save Playlist Išsaugoti grojaraštį - - + + Playlist Files Grojaraščio bylos - + All Supported Bitstreams Palaikomi bylų tipai - + Tools Įrankiai @@ -1745,14 +1770,6 @@ Automatinis takelio slinkimas - - ViewMenu - - - View - Rodyti - - VisualMenu diff --git a/src/ui/translations/qmmp_nl.ts b/src/ui/translations/qmmp_nl.ts index 62b77fe44..86e1f423a 100644 --- a/src/ui/translations/qmmp_nl.ts +++ b/src/ui/translations/qmmp_nl.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File &Voeg Bestand Toe - + F F - + &Add Directory &Voeg Map toe - + D D - + &Add Url &Voeg URL toe - + U U - + &Remove Selected &Verwijder Geselecteerd - + Del Del - + &Remove All &Verwijder Alles - + &Remove Unselected &Verwijder Gedeselecteerde - + Remove unavailable files Verwijder niet aanwezige bestanden - + Remove duplicates Verwijder duplicaten - + &Queue Toggle - + Q Q - + Invert Selection Draai Selectie Om - + &Select None &Selecteer Niets - + &Select All &Selecteer Alles - + Ctrl+A Ctrl+A - + &View Track Details &Bekijk Nummer Details - + Alt+I Alt+I - + &New List &Nieuwe Lijst - + Ctrl+T Ctrl+T - + &Delete List &Verwijder Lijst - + Ctrl+W Ctrl+W - + &Load List &Laad Lijst - + O O @@ -377,62 +397,62 @@ Shift+S - + &Select Next Playlist &Selecteer Volgende Afspeellijst - + Ctrl+PgDown Ctrl+PgDown - + &Select Previous Playlist &Selecteer Vorige Afspeellijst - + Ctrl+PgUp Ctrl+PgUp - + &Show Playlists &Toon Afspeellijst - + P P - + &Settings &Instellingen - + Ctrl+P Ctrl+P - + &About &Over - + &About Qt &Over Qt - + &Exit &Sluit - + Ctrl+Q Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous Vorige - + Play Afspelen - + Pause Pauze - + Stop Stop - + Next Volgende - + Add file Bestand toevoegen - + Equalizer Equalizer - + Playlist Afspeellijst - + Repeat playlist Herhaal afspeellijst - + Shuffle Willekeurig - + Volume Volume - + Balance Balans @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory Kies een map - + Select one or more files to open Kies een of meer bestanden om te openen - + &Jump To File &Spring Naar Bestand - + J J - + + View + Weergave + + + Playlist Afspeellijst - - + + Playlist Files Afspeellijst Bestanden - + Open Playlist Open Afspeellijst - + Save Playlist Bewaar Afspeellijst - + All Supported Bitstreams Alle Ondersteunde Bitstromen - + Tools Gereedschappen @@ -1744,14 +1769,6 @@ Automatisch naar Liednummer Scrollen - - ViewMenu - - - View - Weergave - - VisualMenu diff --git a/src/ui/translations/qmmp_pl_PL.ts b/src/ui/translations/qmmp_pl_PL.ts index ff64de30b..2755dd83e 100644 --- a/src/ui/translations/qmmp_pl_PL.ts +++ b/src/ui/translations/qmmp_pl_PL.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File &Dodaj plik - + F F - + &Add Directory Dodaj &katalog - + D D - + &Add Url Dod&aj Url - + U U - + &Remove Selected &Usuń zaznaczone - + Del Del - + &Remove All Usuń &wszystkie - + &Remove Unselected Usuń &niezaznaczone - + Remove unavailable files Usuń niedostępne pliki - + Remove duplicates Usuń duplikaty - + &Queue Toggle - + Q Q - + Invert Selection Odwróć zaznaczenie - + &Select None &Odznacz wszystkie - + &Select All &Zaznacz wszystkie - + Ctrl+A Ctrl+A - + &View Track Details &Pokaż informacje o pliku - + Alt+I Alt+I - + &New List &Nowa lista - + Ctrl+T - + &Delete List Usuń listę o&dtwarzana - + Ctrl+W - + &Load List &Ładuj listę - + O O @@ -377,62 +397,62 @@ Shift+S - + &Select Next Playlist Wybierz na&stępną listę - + Ctrl+PgDown - + &Select Previous Playlist Wybierz poprzednią li&stę - + Ctrl+PgUp - + &Show Playlists Pokaż li&sty odtwarzania - + P - + &Settings &Ustawienia - + Ctrl+P Ctrl+P - + &About &O programie - + &About Qt &O Qt - + &Exit &Wyjście - + Ctrl+Q Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous Poprzedni - + Play Odtwarzaj - + Pause Pauza - + Stop Zatrzymaj - + Next Następny - + Add file Dodaj plik - + Equalizer Equalizer - + Playlist Lista odtwarzania - + Repeat playlist Powtórz listę odtwarzania - + Shuffle Losowo - + Volume Głośność - + Balance Balans @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory Wybierz katalog - + Select one or more files to open Wybierz jeden lub więcej plików do otwarcia - + &Jump To File &Skocz do pliku - + J J - + + View + Wygląd + + + Playlist Lista odtwarzania - + Open Playlist Otwórz listę odtwarzania - + Save Playlist Zapisz listę odtwarzania - - + + Playlist Files Pliki listy odtwarzania - + All Supported Bitstreams Wszystkie wspierane formaty - + Tools Narzędzia @@ -1744,14 +1769,6 @@ Automatyczne przewijanie tytułu utworu - - ViewMenu - - - View - Wygląd - - VisualMenu diff --git a/src/ui/translations/qmmp_pt_BR.ts b/src/ui/translations/qmmp_pt_BR.ts index 1126ecbfa..24a43e7ef 100644 --- a/src/ui/translations/qmmp_pt_BR.ts +++ b/src/ui/translations/qmmp_pt_BR.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File &Adicionar arquivo - + F - + &Add Directory &Adicionar Diretorio - + D - + &Add Url - + U - + &Remove Selected &Remover selecionadas - + Del - + &Remove All &Remover tudo - + &Remove Unselected &Remover não selecionadas - + Remove unavailable files - + Remove duplicates - + &Queue Toggle - + Q - + Invert Selection Inverter Seleção - + &Select None &Nenhum selecionado - + &Select All &Selecionar tudo - + Ctrl+A - + &View Track Details &Ver detalhes da Faixa - + Alt+I - + &New List &Nova lista - + Ctrl+T - + &Delete List - + Ctrl+W - + &Load List &Carregar lista - + O @@ -377,62 +397,62 @@ - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Settings Configurações - + Ctrl+P - + &About &Sobre - + &About Qt - + &Exit Sair - + Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous - + Play - + Pause - + Stop - + Next - + Add file - + Equalizer - + Playlist Lista de músicas - + Repeat playlist - + Shuffle - + Volume - + Balance @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory Escolher o diretorio - + Select one or more files to open Selecionar um ou mais arquivos - + &Jump To File Pular para arquivo - + J - + + View + + + + Playlist Lista de músicas - + Open Playlist Abrir Playlist - + Save Playlist Salvar Playlist - - + + Playlist Files ФArquivos de lista de músicas - + All Supported Bitstreams - + Tools @@ -1744,14 +1769,6 @@ - - ViewMenu - - - View - - - VisualMenu diff --git a/src/ui/translations/qmmp_ru.ts b/src/ui/translations/qmmp_ru.ts index df14d9319..9869531b7 100644 --- a/src/ui/translations/qmmp_ru.ts +++ b/src/ui/translations/qmmp_ru.ts @@ -223,146 +223,166 @@ + Show Playlist + Показывать список + + + + Alt+E + + + + + Show Equalizer + Показывать эквалайзер + + + + Alt+G + + + + Always on Top Поверх всех окон - + Put on All Workspaces Разместить на всех рабочих столах - + Double Size Двойной размер - + &Add File &Добавить файл - + F - + &Add Directory &Добавить директорию - + D - + &Add Url &Добавить URL - + U - + &Remove Selected &Удалить выделенное - + Del - + &Remove All &Удалить всё - + &Remove Unselected &Удалить невыделенное - + Remove unavailable files Удалить недоступные файлы - + Remove duplicates Удалить дубликаты - + &Queue Toggle &В очередь - + Q - + Invert Selection Инвертировать выделение - + &Select None &Снять выделение - + &Select All &Выделить всё - + Ctrl+A - + &View Track Details &Информация - + Alt+I - + &New List &Новый список - + Ctrl+T - + &Delete List &Удалить список - + Ctrl+W - + &Load List &Загрузить список - + O @@ -377,62 +397,62 @@ - + &Select Next Playlist &Выбрать следующий список - + Ctrl+PgDown - + &Select Previous Playlist &Выбрать предыдущий список - + Ctrl+PgUp - + &Show Playlists &Показать списки - + P - + &Settings &Настройки - + Ctrl+P - + &About &О программе - + &About Qt &О библиотеке Qt - + &Exit &Выход - + Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous Предыдущий фрагмент - + Play Воспроизвести - + Pause Приостановить - + Stop Стоп - + Next Следующий фрагмент - + Add file Добавить файл - + Equalizer Эквалайзер - + Playlist Список - + Repeat playlist Повторять список - + Shuffle В случайном порядке - + Volume Громкость - + Balance Баланс @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory Выберите директорию - + Select one or more files to open Выберите один или несколько файлов - + &Jump To File &Перейти к файлу - + J - + + View + Вид + + + Playlist Список - + Open Playlist Открыть список - + Save Playlist Сохранить список - - + + Playlist Files Файлы списков - + All Supported Bitstreams Все форматы - + Tools Сервис @@ -1744,14 +1769,6 @@ Автопрокрутка названия песни - - ViewMenu - - - View - Вид - - VisualMenu diff --git a/src/ui/translations/qmmp_tr.ts b/src/ui/translations/qmmp_tr.ts index 67b33e11b..31ead37a4 100644 --- a/src/ui/translations/qmmp_tr.ts +++ b/src/ui/translations/qmmp_tr.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File &Dosya Ekle - + F F - + &Add Directory &Dizin Ekle - + D D - + &Add Url &Url Ekle - + U U - + &Remove Selected &Seçileni Kaldır - + Del Del - + &Remove All &Hepsini Kaldır - + &Remove Unselected &Seçilmemişleri Kaldır - + Remove unavailable files - + Remove duplicates - + &Queue Toggle - + Q Q - + Invert Selection Seçimi Tersine Çevir - + &Select None &Hiçbirini Seçme - + &Select All &Tümünü Seç - + Ctrl+A Ctrl+A - + &View Track Details &Parça Detaylarını Göster - + Alt+I Alt+I - + &New List &Yeni Liste - + Ctrl+T - + &Delete List - + Ctrl+W - + &Load List &Liste Yükle - + O O @@ -377,62 +397,62 @@ Shift+S - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Settings &Ayarlar - + Ctrl+P Ctrl+P - + &About &Hakkında - + &About Qt &Qt Hakkında - + &Exit &Çıkış - + Ctrl+Q Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous Önceki - + Play Oynat - + Pause Duraklat - + Stop Durdur - + Next Sonraki - + Add file Dosya ekle - + Equalizer Ekolayzır - + Playlist Çalma Listesi - + Repeat playlist Çalma Listesini Yinele - + Shuffle Rastgele - + Volume Ses - + Balance Denge @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory Bir dizin seçin - + Select one or more files to open Açmak için bir yada daha çok dosya seçin - + &Jump To File &Parçaya Git - + J J - + + View + + + + Playlist Çalma Listesi - + Open Playlist Çalma Listesini Aç - + Save Playlist Çalma Listesini Kaydet - - + + Playlist Files Çalma Listesi Dosyaları - + All Supported Bitstreams Tüm Desteklenen Bitstreamler - + Tools Araçlar @@ -1744,14 +1769,6 @@ Şarkı Adını Otomatik Kaydır - - ViewMenu - - - View - - - VisualMenu diff --git a/src/ui/translations/qmmp_uk_UA.ts b/src/ui/translations/qmmp_uk_UA.ts index 13c35b4a9..7e3abe897 100644 --- a/src/ui/translations/qmmp_uk_UA.ts +++ b/src/ui/translations/qmmp_uk_UA.ts @@ -223,146 +223,166 @@ + Show Playlist + + + + + Alt+E + + + + + Show Equalizer + + + + + Alt+G + + + + Always on Top Завжди зверху - + Put on All Workspaces Розмістити на усіх робочих столах - + Double Size Подвійний розмір - + &Add File &Додати файл - + F - + &Add Directory &Додати теку - + D - + &Add Url &Додати адресу - + U - + &Remove Selected &Видалити вибране - + Del - + &Remove All &Видалити все - + &Remove Unselected &Видалити не вибране - + Remove unavailable files Видалити недоступні файли - + Remove duplicates Видалити дублікати - + &Queue Toggle &В чергу - + Q - + Invert Selection Інвертувати вибране - + &Select None &Зняти виділення - + &Select All &Вибрати все - + Ctrl+A - + &View Track Details &Інформація - + Alt+I - + &New List &Новий список - + Ctrl+T - + &Delete List &Видалити список - + Ctrl+W - + &Load List &Завантажити список - + O @@ -377,62 +397,62 @@ - + &Select Next Playlist Вибрати &наступний список - + Ctrl+PgDown - + &Select Previous Playlist Вибрати &попередній список - + Ctrl+PgUp - + &Show Playlists Показати &всі списки - + P - + &Settings &Налаштування - + Ctrl+P - + &About &Про програму - + &About Qt &Про Qt - + &Exit &Вихід - + Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous Назад - + Play Відтворити - + Pause Пауза - + Stop Стоп - + Next Вперед - + Add file Додати файл - + Equalizer Еквалайзер - + Playlist Список - + Repeat playlist Повторити список - + Shuffle Перемішати - + Volume Гучність - + Balance Баланс @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory Виберіть теку - + Select one or more files to open Виберіть один чи кілька файлів - + &Jump To File &Перейти до файлу - + J - + + View + Вигляд + + + Playlist Список - + Open Playlist Відкрити список - + Save Playlist Зберегти список - - + + Playlist Files Файли списків - + All Supported Bitstreams Усі формати - + Tools Утиліти @@ -1744,14 +1769,6 @@ Автопрокрутка назви пісні - - ViewMenu - - - View - Вигляд - - VisualMenu diff --git a/src/ui/translations/qmmp_zh_CN.ts b/src/ui/translations/qmmp_zh_CN.ts index f69fae1dd..81c8d52b6 100644 --- a/src/ui/translations/qmmp_zh_CN.ts +++ b/src/ui/translations/qmmp_zh_CN.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File 添加文件(&A) - + F F - + &Add Directory 添加文件夹(&A) - + D D - + &Add Url 添加 URL (&A) - + U U - + &Remove Selected 删除所选(&R) - + Del Del - + &Remove All 删除全部(&R) - + &Remove Unselected 删除未选(&R) - + Remove unavailable files - + Remove duplicates - + &Queue Toggle - + Q Q - + Invert Selection 反选 - + &Select None 无选择(&S) - + &Select All 选择全部(&S) - + Ctrl+A Ctrl+A - + &View Track Details 查看音轨详细信息(&V) - + Alt+I Alt+I - + &New List 新建列表(&N) - + Ctrl+T - + &Delete List - + Ctrl+W - + &Load List 载入列表(&L) - + O O @@ -377,62 +397,62 @@ Shift+S - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Settings 设置(&S) - + Ctrl+P Ctrl+P - + &About 关于(&A) - + &About Qt 关于 Qt (&A) - + &Exit 退出(&E) - + Ctrl+Q Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous 上一曲 - + Play 播放 - + Pause 暂停 - + Stop 停止 - + Next 下一曲 - + Add file 添加文件 - + Equalizer 均衡器 - + Playlist 播放列表 - + Repeat playlist 重复播放列表 - + Shuffle 乱序 - + Volume 音量 - + Balance 平衡 @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory 选择一个目录 - + Select one or more files to open 选择打开一个或更多文件 - + &Jump To File 跳到文件(&J) - + J J - + + View + + + + Playlist 播放列表 - + Open Playlist 打开播放列表 - + Save Playlist 保存播放列表 - - + + Playlist Files 播放列表文件 - + All Supported Bitstreams 支持的全部文件 - + Tools 工具 @@ -1744,14 +1769,6 @@ 自动滚动曲目名 - - ViewMenu - - - View - - - VisualMenu diff --git a/src/ui/translations/qmmp_zh_TW.ts b/src/ui/translations/qmmp_zh_TW.ts index 9328a736b..8017e5441 100644 --- a/src/ui/translations/qmmp_zh_TW.ts +++ b/src/ui/translations/qmmp_zh_TW.ts @@ -223,146 +223,166 @@ - Always on Top + Show Playlist + + + + + Alt+E - Put on All Workspaces + Show Equalizer + + + + + Alt+G - Double Size + Always on Top + + + + + Put on All Workspaces + Double Size + + + + &Add File 添加檔案(&A) - + F F - + &Add Directory 添加檔案夾(&A) - + D D - + &Add Url 添加 URL (&A) - + U U - + &Remove Selected 移除所選(&R) - + Del Del - + &Remove All 移除全部(&R) - + &Remove Unselected 移除未選(&R) - + Remove unavailable files - + Remove duplicates - + &Queue Toggle - + Q Q - + Invert Selection 反選 - + &Select None 無選取(&S) - + &Select All 選取全部(&S) - + Ctrl+A Ctrl+A - + &View Track Details 檢視音軌詳細資訊(&V) - + Alt+I Alt+I - + &New List 新建清單(&N) - + Ctrl+T - + &Delete List - + Ctrl+W - + &Load List 載入清單(&L) - + O O @@ -377,62 +397,62 @@ Shift+S - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Settings 設定(&S) - + Ctrl+P Ctrl+P - + &About 關於(&A) - + &About Qt 關於 Qt (&A) - + &Exit 結束(&E) - + Ctrl+Q Ctrl+Q @@ -1129,62 +1149,62 @@ MainDisplay - + Previous 上一曲 - + Play 播放 - + Pause 暫停 - + Stop 停止 - + Next 下一曲 - + Add file 添加檔案 - + Equalizer 均衡器 - + Playlist 播放清單 - + Repeat playlist 重復播放清單 - + Shuffle 亂序 - + Volume 音量 - + Balance 平衡 @@ -1325,53 +1345,58 @@ MainWindow - + Choose a directory 選取一個目錄 - + Select one or more files to open 選取開啟一個或更多檔案 - + &Jump To File 跳到檔案(&J) - + J J - + + View + + + + Playlist 播放清單 - + Open Playlist 開啟播放清單 - + Save Playlist 儲存播放清單 - - + + Playlist Files 播放清單檔案 - + All Supported Bitstreams 支援的全部檔案 - + Tools 工具 @@ -1744,14 +1769,6 @@ 自動捲動曲目名 - - ViewMenu - - - View - - - VisualMenu diff --git a/src/ui/ui.pro b/src/ui/ui.pro index e0adc8bd1..246399e88 100644 --- a/src/ui/ui.pro +++ b/src/ui/ui.pro @@ -57,7 +57,6 @@ HEADERS += mainwindow.h \ popupwidget.h \ popupsettings.h \ windowsystem.h \ - viewmenu.h \ lxdesupport.h \ actionmanager.h \ shortcutitem.h \ @@ -112,7 +111,6 @@ SOURCES += mainwindow.cpp \ popupwidget.cpp \ popupsettings.cpp \ windowsystem.cpp \ - viewmenu.cpp \ lxdesupport.cpp \ actionmanager.cpp \ shortcutitem.cpp \ diff --git a/src/ui/viewmenu.cpp b/src/ui/viewmenu.cpp deleted file mode 100644 index f762f7d54..000000000 --- a/src/ui/viewmenu.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@hotmail.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ - -#include -#include -#include "actionmanager.h" -#include "viewmenu.h" - -ViewMenu::ViewMenu(MainWindow *parent) : QMenu(parent) -{ - setTitle(tr("View")); - m_alwaysOnTopAction = ActionManager::instance()->action(ActionManager::WM_ALLWAYS_ON_TOP); - m_showOnAllDesktopsAction = ActionManager::instance()->action(ActionManager::WM_STICKY); - m_doubleSizeAction = ActionManager::instance()->action(ActionManager::WM_DOUBLE_SIZE); - addAction(m_alwaysOnTopAction); - addAction(m_showOnAllDesktopsAction); - addAction(m_doubleSizeAction); - QSettings settings (Qmmp::configFile(), QSettings::IniFormat); - m_doubleSizeAction->setChecked(settings.value ("General/double_size", false).toBool()); - m_alwaysOnTopAction->setChecked(settings.value ("General/always_on_top",false).toBool()); - m_showOnAllDesktopsAction->setChecked(settings.value ("General/show_on_all_desktops", false).toBool()); - connect(this, SIGNAL(triggered(QAction*)), SLOT(updateSettings())); -} - -void ViewMenu::updateSettings() -{ - QSettings settings (Qmmp::configFile(), QSettings::IniFormat); - settings.setValue ("General/double_size", m_doubleSizeAction->isChecked()); - settings.setValue ("General/always_on_top", m_alwaysOnTopAction->isChecked()); - settings.setValue ("General/show_on_all_desktops", m_showOnAllDesktopsAction->isChecked()); - qobject_cast (parent())->updateSettings(); -} diff --git a/src/ui/viewmenu.h b/src/ui/viewmenu.h deleted file mode 100644 index d5a90af2d..000000000 --- a/src/ui/viewmenu.h +++ /dev/null @@ -1,45 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@hotmail.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ - -#ifndef VIEWMENU_H -#define VIEWMENU_H - -#include -#include "mainwindow.h" - -/** - @author Ilya Kotov -*/ -class ViewMenu : public QMenu -{ -Q_OBJECT -public: - explicit ViewMenu(MainWindow *parent = 0); - -private slots: - void updateSettings(); - -private: - QAction *m_alwaysOnTopAction; - QAction *m_showOnAllDesktopsAction; - QAction *m_doubleSizeAction; -}; - -#endif // VIEWMENU_H -- cgit v1.2.3-13-gbd6f