From ecc137abe40edc93062c8a62168fa7d1cf5dcc63 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 2 Nov 2009 18:23:26 +0000 Subject: added possibility to disable skin cursors git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1350 90c681e8-e032-0410-971d-27865f9a5e38 --- .../notifier/translations/notifier_plugin_ru.ts | 5 +- .../notifier/translations/notifier_plugin_tr.ts | 5 +- src/ui/balancebar.cpp | 2 +- src/ui/button.cpp | 2 +- src/ui/configdialog.cpp | 5 +- src/ui/display.cpp | 2 +- src/ui/eqgraph.cpp | 2 +- src/ui/eqslider.cpp | 2 +- src/ui/eqtitlebar.cpp | 20 +- src/ui/eqwidget.cpp | 2 +- src/ui/forms/configdialog.ui | 20 +- src/ui/listwidget.cpp | 2 +- src/ui/listwidget.h | 2 +- src/ui/mainvisual.cpp | 6 +- src/ui/mainwindow.cpp | 1 + src/ui/monostereo.cpp | 2 +- src/ui/number.cpp | 2 +- src/ui/playlist.cpp | 6 +- src/ui/playlistcontrol.cpp | 2 +- src/ui/playlistslider.cpp | 2 +- src/ui/playlisttitlebar.cpp | 12 +- src/ui/playstatus.cpp | 2 +- src/ui/positionbar.cpp | 2 +- src/ui/shadedbar.cpp | 2 +- src/ui/shadedvisual.cpp | 2 +- src/ui/skin.cpp | 66 ++-- src/ui/skin.h | 59 ++-- src/ui/symboldisplay.cpp | 2 +- src/ui/textscroller.cpp | 2 +- src/ui/timeindicator.cpp | 2 +- src/ui/titlebar.cpp | 25 +- src/ui/togglebutton.cpp | 2 +- src/ui/translations/qmmp_cs.ts | 350 +++++++++++---------- src/ui/translations/qmmp_de.ts | 350 +++++++++++---------- src/ui/translations/qmmp_it.ts | 350 +++++++++++---------- src/ui/translations/qmmp_lt.ts | 350 +++++++++++---------- src/ui/translations/qmmp_pl_PL.ts | 350 +++++++++++---------- src/ui/translations/qmmp_pt_BR.ts | 350 +++++++++++---------- src/ui/translations/qmmp_ru.ts | 350 +++++++++++---------- src/ui/translations/qmmp_tr.ts | 350 +++++++++++---------- src/ui/translations/qmmp_uk_UA.ts | 350 +++++++++++---------- src/ui/translations/qmmp_zh_CN.ts | 350 +++++++++++---------- src/ui/translations/qmmp_zh_TW.ts | 350 +++++++++++---------- src/ui/volumebar.cpp | 2 +- 44 files changed, 2096 insertions(+), 2026 deletions(-) (limited to 'src') diff --git a/src/plugins/General/notifier/translations/notifier_plugin_ru.ts b/src/plugins/General/notifier/translations/notifier_plugin_ru.ts index d7d3c8fa2..3956be1be 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_ru.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_ru.ts @@ -1,6 +1,6 @@ - - + + NotifierFactory @@ -80,6 +80,7 @@ Прозрачность + 0 diff --git a/src/plugins/General/notifier/translations/notifier_plugin_tr.ts b/src/plugins/General/notifier/translations/notifier_plugin_tr.ts index 9cd760014..c6f3f6655 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_tr.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_tr.ts @@ -1,6 +1,6 @@ - - + + NotifierFactory @@ -70,6 +70,7 @@ Şeffaflık + 0 0 diff --git a/src/ui/balancebar.cpp b/src/ui/balancebar.cpp index 3089e0cbd..184db3061 100644 --- a/src/ui/balancebar.cpp +++ b/src/ui/balancebar.cpp @@ -32,7 +32,7 @@ BalanceBar::BalanceBar(QWidget *parent) : PixmapWidget(parent) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getBalanceBar(0)); m_moving = FALSE; diff --git a/src/ui/button.cpp b/src/ui/button.cpp index e06ce823f..742cf0907 100644 --- a/src/ui/button.cpp +++ b/src/ui/button.cpp @@ -31,7 +31,7 @@ Button::Button (QWidget *parent, uint normal, uint pressed, uint cursor) name_normal = normal; name_pressed = pressed; name_cursor = cursor; - skin = Skin::getPointer(); + skin = Skin::instance(); setON (FALSE); setCursor (skin->getCursor (name_cursor)); connect (skin, SIGNAL (skinChanged()), this, SLOT (updateSkin())); diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp index 834ce121e..7033a5be5 100644 --- a/src/ui/configdialog.cpp +++ b/src/ui/configdialog.cpp @@ -77,7 +77,7 @@ ConfigDialog::ConfigDialog (QWidget *parent) connect (ui.skinReloadButton, SIGNAL (clicked()), SLOT(loadSkins())); connect (ui.listWidget, SIGNAL (itemClicked (QListWidgetItem *)), this, SLOT (changeSkin())); ui.listWidget->setIconSize (QSize (105,34)); - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); readSettings(); m_reader = new SkinReader(this); loadSkins(); @@ -137,6 +137,8 @@ void ConfigDialog::readSettings() ui.plTransparencySlider->setValue(100 - settings.value("PlayList/opacity", 1.0).toDouble()*100); //compatibility ui.openboxCheckBox->setChecked(settings.value("General/openbox_compat", FALSE).toBool()); + //skin options + ui.skinCursorsCheckBox->setChecked(settings.value("General/skin_cursors", FALSE).toBool()); } void ConfigDialog::changePage (QListWidgetItem *current, QListWidgetItem *previous) @@ -627,6 +629,7 @@ void ConfigDialog::saveSettings() settings.setValue ("PlayList/opacity", 1.0 - (double)ui.plTransparencySlider->value()/100); settings.setValue ("General/openbox_compat", ui.openboxCheckBox->isChecked()); settings.setValue ("MainWindow/bitmap_font", ui.useBitmapCheckBox->isChecked()); + settings.setValue ("General/skin_cursors", ui.skinCursorsCheckBox->isChecked()); } void ConfigDialog::updateButtons() diff --git a/src/ui/display.cpp b/src/ui/display.cpp index b2d9f3f9c..2f424e4c8 100644 --- a/src/ui/display.cpp +++ b/src/ui/display.cpp @@ -49,7 +49,7 @@ MainDisplay::MainDisplay (QWidget *parent) : PixmapWidget (parent) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); setPixmap (m_skin->getMain()); setCursor(m_skin->getCursor(Skin::CUR_NORMAL)); setMaximumSize (QSize (275,116)); diff --git a/src/ui/eqgraph.cpp b/src/ui/eqgraph.cpp index 1492a32e6..de41a53b7 100644 --- a/src/ui/eqgraph.cpp +++ b/src/ui/eqgraph.cpp @@ -25,7 +25,7 @@ EQGraph::EQGraph (QWidget *parent) : PixmapWidget (parent) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); setPixmap (m_skin->getEqPart (Skin::EQ_GRAPH)); clear(); draw(); diff --git a/src/ui/eqslider.cpp b/src/ui/eqslider.cpp index 57cd63a57..6add1f281 100644 --- a/src/ui/eqslider.cpp +++ b/src/ui/eqslider.cpp @@ -30,7 +30,7 @@ EqSlider::EqSlider(QWidget *parent) : PixmapWidget(parent) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getEqSlider(0)); m_moving = FALSE; diff --git a/src/ui/eqtitlebar.cpp b/src/ui/eqtitlebar.cpp index d61541a80..5ebc92800 100644 --- a/src/ui/eqtitlebar.cpp +++ b/src/ui/eqtitlebar.cpp @@ -39,7 +39,7 @@ EqTitleBar::EqTitleBar(QWidget *parent) m_right = 0; m_shaded = FALSE; m_align = FALSE; - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); m_eq = parentWidget(); m_mw = qobject_cast(m_eq->parent()); m_close = new Button(this, Skin::EQ_BT_CLOSE_N, Skin::EQ_BT_CLOSE_P, Skin::CUR_EQCLOSE); @@ -71,30 +71,16 @@ void EqTitleBar::setActive(bool active) if (active) { if (m_shaded) - { setPixmap(m_skin->getEqPart(Skin::EQ_TITLEBAR_SHADED_A)); - m_shade2->show(); - } else - { setPixmap(m_skin->getEqPart(Skin::EQ_TITLEBAR_A)); - m_shade->show(); - } - m_close->show(); } else { if (m_shaded) - { setPixmap(m_skin->getEqPart(Skin::EQ_TITLEBAR_SHADED_I)); - m_shade2->hide(); - } else - { setPixmap(m_skin->getEqPart(Skin::EQ_TITLEBAR_I)); - m_shade->hide(); - } - m_close->hide(); } } @@ -116,15 +102,11 @@ void EqTitleBar::mousePressEvent(QMouseEvent* event) switch ((int) event->button ()) { case Qt::LeftButton: - { m_pos = event->pos(); break; - } case Qt::RightButton: - { m_mw->menu()->exec(event->globalPos()); } - } } void EqTitleBar::mouseMoveEvent(QMouseEvent* event) diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp index dd705f4c2..4da9625fc 100644 --- a/src/ui/eqwidget.cpp +++ b/src/ui/eqwidget.cpp @@ -42,7 +42,7 @@ EqWidget::EqWidget (QWidget *parent) : PixmapWidget (parent) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); setPixmap (m_skin->getEqPart (Skin::EQ_MAIN)); setCursor (m_skin->getCursor (Skin::CUR_EQNORMAL)); //setPixmap(QPixmap(275,116)); diff --git a/src/ui/forms/configdialog.ui b/src/ui/forms/configdialog.ui index 95d71f931..33ba3d9a8 100644 --- a/src/ui/forms/configdialog.ui +++ b/src/ui/forms/configdialog.ui @@ -224,7 +224,7 @@ Miscellaneous - + @@ -333,7 +333,7 @@ - + Use bitmap font if available @@ -343,6 +343,22 @@ + + + + Skin Options + + + + + + Use skin cursors + + + + + + diff --git a/src/ui/listwidget.cpp b/src/ui/listwidget.cpp index f9ddacbaa..90cd4e53b 100644 --- a/src/ui/listwidget.cpp +++ b/src/ui/listwidget.cpp @@ -43,7 +43,7 @@ ListWidget::ListWidget(QWidget *parent) : QWidget(parent) { m_update = FALSE; - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); loadColors(); m_menu = new QMenu(this); m_scroll_direction = NONE; diff --git a/src/ui/listwidget.h b/src/ui/listwidget.h index 6f3774fe6..df3889593 100644 --- a/src/ui/listwidget.h +++ b/src/ui/listwidget.h @@ -82,7 +82,7 @@ public slots: QMenu *menu() { return m_menu; - }; + } signals: void selectionChanged(); diff --git a/src/ui/mainvisual.cpp b/src/ui/mainvisual.cpp index 0c4d36c6b..852244171 100644 --- a/src/ui/mainvisual.cpp +++ b/src/ui/mainvisual.cpp @@ -46,7 +46,7 @@ MainVisual *MainVisual::getPointer() MainVisual::MainVisual (QWidget *parent) : Visual (parent), m_vis (0), m_playing (FALSE) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSettings())); resize(75,20); m_pixmap = QPixmap (75,20); @@ -428,7 +428,7 @@ Analyzer::Analyzer() { m_size = QSize(75,20); clear(); - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); double peaks_speed[] = { 0.05, 0.1, 0.2, 0.4, 0.8 }; double analyzer_speed[] = { 1.2, 1.8, 2.2, 2.8, 2.4 }; @@ -568,7 +568,7 @@ void Analyzer::draw (QPainter *p) Scope::Scope() { clear(); - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); } void Scope::clear() diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 872c02d09..e398af084 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -395,6 +395,7 @@ void MainWindow::showSettings() TextScroller::getPointer()->readSettings(); //m_core->updateConfig(); m_visMenu->updateActions(); + m_skin->reloadSkin(); } delete m_confDialog; } diff --git a/src/ui/monostereo.cpp b/src/ui/monostereo.cpp index 659fec7be..28d51a6bf 100644 --- a/src/ui/monostereo.cpp +++ b/src/ui/monostereo.cpp @@ -25,7 +25,7 @@ MonoStereo::MonoStereo ( QWidget *parent ) : PixmapWidget ( parent ) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); m_pixmap = QPixmap ( 54,12 ); setChannels ( 0 ); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); diff --git a/src/ui/number.cpp b/src/ui/number.cpp index 9f127965e..d818da72f 100644 --- a/src/ui/number.cpp +++ b/src/ui/number.cpp @@ -23,7 +23,7 @@ Number::Number(QWidget *parent) : PixmapWidget(parent) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); //TODO default value?? connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); } diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp index 5abe64510..985678bc2 100644 --- a/src/ui/playlist.cpp +++ b/src/ui/playlist.cpp @@ -51,10 +51,7 @@ PlayList::PlayList (QWidget *parent) m_update = FALSE; m_resize = FALSE; m_anchor_row = -1; - createMenus(); - - resize (275,116); setMinimumSize (275,116); setBaseSize (275,116); @@ -66,7 +63,7 @@ PlayList::PlayList (QWidget *parent) m_plslider->show(); setSizeIncrement (25,29); - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); m_buttonAdd = new Button (this,Skin::PL_BT_ADD,Skin::PL_BT_ADD, Skin::CUR_PNORMAL); m_buttonAdd->move (11,86); @@ -377,7 +374,6 @@ void PlayList::mousePressEvent (QMouseEvent *e) if ((m_pos.x() > width()-25) && (m_pos.y() > height()-25)) { m_resize = TRUE; - // TODO if no skinned cursor, the cursor is the default arrow setCursor (m_skin->getCursor (Skin::CUR_PSIZE)); } else diff --git a/src/ui/playlistcontrol.cpp b/src/ui/playlistcontrol.cpp index 8a2c6a153..07ba0b16f 100644 --- a/src/ui/playlistcontrol.cpp +++ b/src/ui/playlistcontrol.cpp @@ -27,7 +27,7 @@ PlaylistControl::PlaylistControl(QWidget* parent) : PixmapWidget(parent) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); } diff --git a/src/ui/playlistslider.cpp b/src/ui/playlistslider.cpp index 936a4a4ab..6a36b8740 100644 --- a/src/ui/playlistslider.cpp +++ b/src/ui/playlistslider.cpp @@ -28,7 +28,7 @@ PlayListSlider::PlayListSlider(QWidget *parent) : QWidget(parent) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); m_moving = FALSE; m_pressed = FALSE; diff --git a/src/ui/playlisttitlebar.cpp b/src/ui/playlisttitlebar.cpp index 9eafd0690..52a9cfd3b 100644 --- a/src/ui/playlisttitlebar.cpp +++ b/src/ui/playlisttitlebar.cpp @@ -39,7 +39,7 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent) m_model = 0; m_shaded = FALSE; m_align = FALSE; - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); setSizeIncrement(25,1); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); m_pl = qobject_cast(parent); @@ -93,10 +93,7 @@ void PlayListTitleBar::drawPixmap(int sx) if (m_active) { if (m_shaded) - { - m_shade2->show(); paint.drawPixmap(225+sx*25,0,m_skin->getPlPart(Skin::PL_TITLEBAR_SHADED1_A)); - } else { paint.drawPixmap(0,0,m_skin->getPlPart(Skin::PL_CORNER_UL_A)); @@ -106,17 +103,12 @@ void PlayListTitleBar::drawPixmap(int sx) } paint.drawPixmap(100-12+12*sx,0,m_skin->getPlPart(Skin::PL_TITLEBAR_A)); paint.drawPixmap(250+sx*25,0,m_skin->getPlPart(Skin::PL_CORNER_UR_A)); - m_close->show(); - m_shade->show(); } } else { if (m_shaded) - { - m_shade2->hide(); paint.drawPixmap(275-50+sx*25,0,m_skin->getPlPart(Skin::PL_TITLEBAR_SHADED1_I)); - } else { paint.drawPixmap(0,0,m_skin->getPlPart(Skin::PL_CORNER_UL_I)); @@ -126,8 +118,6 @@ void PlayListTitleBar::drawPixmap(int sx) } paint.drawPixmap(100-12+12*sx,0,m_skin->getPlPart(Skin::PL_TITLEBAR_I)); paint.drawPixmap(250+sx*25,0,m_skin->getPlPart(Skin::PL_CORNER_UR_I)); - m_close->hide(); - m_shade->hide(); } } if (m_shaded) diff --git a/src/ui/playstatus.cpp b/src/ui/playstatus.cpp index 913199c4f..f12efb258 100644 --- a/src/ui/playstatus.cpp +++ b/src/ui/playstatus.cpp @@ -23,7 +23,7 @@ PlayStatus::PlayStatus ( QWidget *parent ) : PixmapWidget ( parent ) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); setStatus ( STOP ); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); } diff --git a/src/ui/positionbar.cpp b/src/ui/positionbar.cpp index b15a90441..378df94a8 100644 --- a/src/ui/positionbar.cpp +++ b/src/ui/positionbar.cpp @@ -32,7 +32,7 @@ PositionBar::PositionBar(QWidget *parent) : PixmapWidget(parent) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getPosBar()); mw = qobject_cast(window()); diff --git a/src/ui/shadedbar.cpp b/src/ui/shadedbar.cpp index 978cf2d71..97e5ded94 100644 --- a/src/ui/shadedbar.cpp +++ b/src/ui/shadedbar.cpp @@ -35,7 +35,7 @@ ShadedBar::ShadedBar(QWidget *parent, uint slider1, uint slider2, uint slider3) m_slider3 = slider3; setFixedSize(97,7); //setAutoFillBackground (TRUE); - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); m_moving = FALSE; m_min = 0; diff --git a/src/ui/shadedvisual.cpp b/src/ui/shadedvisual.cpp index 2c9d0f3fa..f7380da52 100644 --- a/src/ui/shadedvisual.cpp +++ b/src/ui/shadedvisual.cpp @@ -32,7 +32,7 @@ ShadedVisual::ShadedVisual(QWidget *parent) { setFixedSize(38,5); m_pixmap = QPixmap (38,5); - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); m_timer = new QTimer(this); connect(m_timer, SIGNAL (timeout()), this, SLOT (timeout())); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); diff --git a/src/ui/skin.cpp b/src/ui/skin.cpp index becef5e42..440a1ab26 100644 --- a/src/ui/skin.cpp +++ b/src/ui/skin.cpp @@ -33,13 +33,13 @@ #include "skin.h" #include "cursorimage.h" -Skin *Skin::pointer = 0; +Skin *Skin::m_instance = 0; -Skin *Skin::getPointer() +Skin *Skin::instance() { - if (!pointer) - pointer = new Skin(); - return pointer; + if (!m_instance) + m_instance = new Skin(); + return m_instance; } QPixmap Skin::getPixmap (const QString& name, QDir dir) @@ -58,10 +58,9 @@ QPixmap Skin::getPixmap (const QString& name, QDir dir) return QPixmap(); } -Skin::Skin (QObject *parent) - : QObject (parent) +Skin::Skin (QObject *parent) : QObject (parent) { - pointer = this; + m_instance = this; QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString path = settings.value("skin_path","").toString(); if (path.isEmpty() || !QDir(path).exists ()) @@ -72,37 +71,38 @@ Skin::Skin (QObject *parent) skinDir.mkdir ("skins"); } - Skin::~Skin() {} void Skin::setSkin (const QString& path) { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); + m_use_cursors = settings.value("General/skin_cursors", FALSE).toBool(); settings.setValue("skin_path",path); - - qDebug ("Skin: set skin %s",qPrintable(path)); //TODO don't clear lists + qDebug ("Skin: using %s",qPrintable(path)); m_skin_dir = QDir (path); - + //clear old values m_pledit_txt.clear(); + buttons.clear(); + titlebar.clear(); + m_numbers.clear(); + m_pl_parts.clear(); + m_eq_parts.clear(); + m_eq_bar.clear(); + m_eq_spline.clear(); + m_vis_colors.clear(); + cursors.clear(); + //load skin parts loadPLEdit(); loadMain(); - buttons.clear(); loadButtons(); loadShufRep(); - titlebar.clear(); loadTitleBar(); loadPosBar(); - m_numbers.clear(); loadNumbers(); - m_pl_parts.clear(); loadPlayList(); - m_eq_parts.clear(); loadEq_ex(); - m_eq_bar.clear(); - m_eq_spline.clear(); loadEqMain(); - m_vis_colors.clear(); loadVisColor(); loadLetters(); loadMonoSter(); @@ -113,6 +113,11 @@ void Skin::setSkin (const QString& path) emit skinChanged(); } +void Skin::reloadSkin() +{ + setSkin (m_skin_dir.absolutePath ()); +} + void Skin::loadMain() { QPixmap *pixmap = getPixmap ("main"); @@ -125,6 +130,11 @@ void Skin::loadMain() void Skin::loadCursors() { + if(!m_use_cursors) + { + cursors[CUR_PSIZE] = QCursor(Qt::SizeFDiagCursor); + return; + } cursors[CUR_NORMAL] = createCursor(getPath("normal")); cursors[CUR_CLOSE] = createCursor(getPath("close")); cursors[CUR_MAINMENU] = createCursor(getPath("mainmenu")); @@ -146,6 +156,8 @@ void Skin::loadCursors() cursors[CUR_PCLOSE] = createCursor(getPath("pclose")); cursors[CUR_PNORMAL] = createCursor(getPath("pnormal")); cursors[CUR_PSIZE] = createCursor(getPath("psize")); + if(cursors[CUR_PSIZE].shape() == Qt::ArrowCursor) + cursors[CUR_PSIZE] = QCursor(Qt::SizeFDiagCursor); cursors[CUR_PTBAR] = createCursor(getPath("ptbar")); cursors[CUR_PVSCROLL] = createCursor(getPath("pvscroll")); cursors[CUR_PWINBUT] = createCursor(getPath("pwinbut")); @@ -185,12 +197,10 @@ void Skin::loadButtons() buttons[BT_EJECT_N] = pixmap->copy (114, 0,22,16); buttons[BT_EJECT_P] = pixmap->copy (114,16,22,16); delete pixmap; - } void Skin::loadTitleBar() { - QPixmap *pixmap = getPixmap ("titlebar"); if (!pixmap) @@ -211,12 +221,10 @@ void Skin::loadTitleBar() titlebar[TITLEBAR_SHADED_A] = pixmap->copy (27,29,275,14); titlebar[TITLEBAR_SHADED_I] = pixmap->copy (27,42,275,14); delete pixmap; - } void Skin::loadPosBar() { - QPixmap *pixmap = getPixmap ("posbar"); if (!pixmap) @@ -236,7 +244,6 @@ void Skin::loadPosBar() } posbar = pixmap->copy (0,0,248,pixmap->height()); delete pixmap; - } void Skin::loadNumbers() @@ -274,7 +281,6 @@ void Skin::loadNumbers() void Skin::loadPlayList() { - QPixmap *pixmap = getPixmap ("pledit"); if (!pixmap) @@ -359,7 +365,7 @@ QString Skin::getPath (const QString& name) return fileInfo.filePath(); } } - return ""; + return QString(); } @@ -443,7 +449,6 @@ void Skin::loadEqMain() m_eq_spline << pixmap->copy (115, 294+i, 1, 1); } delete pixmap; - } void Skin::loadEq_ex() @@ -545,7 +550,6 @@ void Skin::loadShufRep() buttons[SHUFFLE_OFF_P] = pixmap->copy (28,15,46,15); delete pixmap; - } void Skin::loadLetters(void) @@ -713,8 +717,6 @@ void Skin::loadBalance() void Skin::loadRegion() { - //m_mwRegion = QRegion(); - //m_plRegion = QRegion(); m_regions.clear(); QString path = findFile("region.txt", m_skin_dir); @@ -776,7 +778,7 @@ QPixmap * Skin::getDummyPixmap(const QString& name) return new QPixmap (fileInfo.filePath()); } } - qFatal("Skin: default skin corrupted"); + qFatal("Skin: default skin is corrupted"); return 0; } diff --git a/src/ui/skin.h b/src/ui/skin.h index c50b93743..bb16d7687 100644 --- a/src/ui/skin.h +++ b/src/ui/skin.h @@ -31,8 +31,6 @@ #include #include - - class Skin : public QObject { Q_OBJECT @@ -41,33 +39,32 @@ public: ~Skin(); - static Skin *getPointer(); + static Skin *instance(); static QPixmap getPixmap(const QString&, QDir); - void setSkin(const QString& path); const QPixmap getMain() const { return m_main; - }; + } const QPixmap getButton(uint bt) const { return buttons[bt]; - }; + } const QCursor getCursor(uint cu) const { return cursors[cu]; - }; + } const QPixmap getTitleBar(uint tb) const { return titlebar[tb]; - }; + } const QPixmap getPosBar() const { return posbar; - }; + } const QPixmap getNumber(uint n) const { return m_numbers[n]; - }; + } /*! * Returns count of numbers in number list. * We need this to check if we have "-" in pixmaps. @@ -80,59 +77,51 @@ public: const QPixmap getPlPart(uint p) const { return m_pl_parts[p]; - }; + } const QPixmap getEqPart(uint p) const { return m_eq_parts[p]; - }; + } const QPixmap getEqSlider(uint n) const { return m_eq_bar[n]; - }; + } const QPixmap getEqSpline(uint n) const { return m_eq_spline[n]; - }; + } const QPixmap getMSPart(uint n) const { return m_ms_parts[n]; - }; + } const QPixmap getLetter(const QChar& ch) const { return m_letters[ch]; - }; + } const QPixmap getItem(uint n) const { return m_parts[n]; - }; + } const QPixmap getVolumeBar(int n) const { return m_volume[n]; - }; + } const QPixmap getBalanceBar(int n) const { return m_balance[n]; - }; + } const QByteArray getPLValue (QByteArray c) const { return m_pledit_txt[c]; - }; + } const QColor getVisColor(int n) const { return m_vis_colors[n]; - }; - /*const QRegion getMWRegion() const - { - return m_mwRegion; - }; - const QRegion getPLRegion() const - { - return m_plRegion; - };*/ + } const QRegion getRegion(uint r) const { return m_regions[r]; - }; + } enum Buttons { @@ -330,6 +319,10 @@ public: CUR_WSWINBUT, }; +public slots: + void setSkin(const QString& path); + void reloadSkin(); + signals: void skinChanged(); @@ -346,7 +339,7 @@ private: * to load pixmap from default skin. */ QPixmap *getDummyPixmap(const QString&); - static Skin *pointer; + static Skin *m_instance; QDir m_skin_dir; QMap buttons; QMap cursors; @@ -366,8 +359,7 @@ private: QList m_volume; QList m_balance; QList m_vis_colors; - //QRegion m_mwRegion; - //QRegion m_plRegion; + bool m_use_cursors; void loadMain(); void loadButtons(); @@ -387,7 +379,6 @@ private: void loadBalance(); void loadRegion(); QRegion createRegion(const QString &path, const QString &key); - }; #endif diff --git a/src/ui/symboldisplay.cpp b/src/ui/symboldisplay.cpp index fcc70c816..e33533f08 100644 --- a/src/ui/symboldisplay.cpp +++ b/src/ui/symboldisplay.cpp @@ -28,7 +28,7 @@ SymbolDisplay::SymbolDisplay ( QWidget *parent, int digits ) : PixmapWidget ( parent ), m_digits ( digits ), m_text(), m_max(0) { m_alignment = Qt::AlignRight; - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); connect ( m_skin, SIGNAL ( skinChanged() ), this, SLOT (draw())); draw(); for (int i=0; igetTitleBar(Skin::TITLEBAR_A)); m_mw = qobject_cast(parent); m_shaded = FALSE; @@ -67,7 +67,6 @@ TitleBar::TitleBar(QWidget *parent) setCursor(m_skin->getCursor(Skin::CUR_TITLEBAR)); } - TitleBar::~TitleBar() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); @@ -79,16 +78,12 @@ void TitleBar::mousePressEvent(QMouseEvent* event) switch ((int) event->button ()) { case Qt::LeftButton: - { m_pos = event->pos(); Dock::getPointer()->calculateDistances(); break; - } case Qt::RightButton: - { m_mw->menu()->exec(event->globalPos()); } - } } void TitleBar::mouseReleaseEvent(QMouseEvent*) @@ -109,34 +104,16 @@ void TitleBar::setActive(bool a) if (a) { if (m_shaded) - { setPixmap(m_skin->getTitleBar(Skin::TITLEBAR_SHADED_A)); - m_shade2->show(); - } else - { setPixmap(m_skin->getTitleBar(Skin::TITLEBAR_A)); - m_shade->show(); - } - m_menu->show(); - m_minimize->show(); - m_close->show(); } else { if (m_shaded) - { setPixmap(m_skin->getTitleBar(Skin::TITLEBAR_SHADED_I)); - m_shade2->hide(); - } else - { setPixmap(m_skin->getTitleBar(Skin::TITLEBAR_I)); - m_shade->hide(); - } - m_menu->hide(); - m_minimize->hide(); - m_close->hide(); } } diff --git a/src/ui/togglebutton.cpp b/src/ui/togglebutton.cpp index e5860f958..020ef7c8b 100644 --- a/src/ui/togglebutton.cpp +++ b/src/ui/togglebutton.cpp @@ -33,7 +33,7 @@ ToggleButton::ToggleButton ( QWidget *parent,uint on_n,uint on_p,uint off_n,uint m_off_n = off_n; m_off_p = off_p; m_on = FALSE; - skin = Skin::getPointer(); + skin = Skin::instance(); setON ( FALSE ); connect ( skin, SIGNAL ( skinChanged() ), this, SLOT ( updateSkin() ) ); } diff --git a/src/ui/translations/qmmp_cs.ts b/src/ui/translations/qmmp_cs.ts index 359b11202..94d6b13e3 100644 --- a/src/ui/translations/qmmp_cs.ts +++ b/src/ui/translations/qmmp_cs.ts @@ -173,84 +173,84 @@ ConfigDialog - - - - - + + + + + Enabled Povoleno - - - - - + + + + + Description Popis - - - - - + + + + + Filename Soubor - + Artist Umělec - + Album Album - + Title Název - + Track number Číslo stopy - + Disc number Číslo disku - + Composer Skladatel - + File name Název souboru - + File path Cesta k souboru - + Genre Žánr - + Year Rok - + Comment Komentář @@ -266,7 +266,7 @@ - + Playlist Seznam skladeb @@ -314,7 +314,7 @@ - + ... ... @@ -324,63 +324,73 @@ - + + Skin Options + + + + + Use skin cursors + + + + Metadata Metadata - + Load metadata from files Číst ze souborů metadata - + Song Display Zobrazení skladby - + Title format: Formát titulku: - + Show song numbers Zobrazit čísla skladeb - + Preferences Nastavení - - + + Information Informace - + Input Vstup - + Output Výstup - + Compatibility Kompatibilita - + Openbox compatibility Kompatibilita s Openbox - + Close Zavřít @@ -390,112 +400,112 @@ Síť - + File Dialog Souborový dialog - + Proxy Proxy - + Enable proxy usage Povolit používání proxy - + Proxy host name: Adresa proxy: - + Proxy port: Port proxy: - + Use authentication with proxy Použít autorizaci pro proxy - + Proxy user name: Uživatelské jméno: - + Proxy password: Heslo: - + Archived skin Sbalené téma - + Unarchived skin Rozbalené téma - + Visualization Vizualizace - + Effects Efekty - + General Obecné - + Audio Zvuk - + Use software volume control Používat softwarové ovládání hlasitosti - + Visibility Control Viditelnost - + Hide on close Skrýt při zavření - + Start hidden Spustit skryté - + Convert underscores to blanks Převést podtržítka na mezery - + Convert %20 to blanks Převést %20 na mezery - + Select Skin Files Vybrat soubory s tématy - + Skin files Soubory s tématy @@ -510,29 +520,29 @@ Obnovit - + Show protocol Zobrazit protokol - + Transparency Průhlednost - + Main window Hlavní okno - - - + + + 0 0 - + Equalizer Ekvalizér @@ -540,53 +550,53 @@ EqWidget - - + + preset předvolba - + &Load/Delete &Načíst/Odstranit - + &Save Preset &Uložit předvolbu - + &Save Auto-load Preset Uložit &automatickou předvolbu - + &Import &Importovat - + &Clear &Vynulovat - + Saving Preset Uložení předvolby - + Preset name: Název předvolby: - + preset # předvolba # - + Import Preset Importovat předvolbu @@ -635,62 +645,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í @@ -832,7 +842,7 @@ MainWindow - + Default Seznam @@ -847,118 +857,118 @@ Vyberte jeden či více souborů k otevření - + &Play Pře&hrát - + X X - + &Pause Pau&za - + C C - + &Stop &Stop - + V V - + &Previous &Předchozí - + Z Z - + &Next &Další - + B B - + &Jump To File Přeskočit na soubo&r - + J J - + &Settings &Nastavení - + Ctrl+P Ctrl+P - + &About O &aplikaci - + &Exit U&končit - + Ctrl+Q Ctrl+Q - - + + Playlist Files Seznamy skladeb - + Open Playlist Načíst seznam skladeb - + Save Playlist Uložit seznam skladeb - + Space Mezerník - + &About Qt O knihovně &Qt - + &Play/Pause &Přehrát/Pauza @@ -968,37 +978,37 @@ Všechny podporované formáty - + &Repeat Track &Opakovat stopu - + &Shuffle Za&míchat - + R O - + Ctrl+R Ctrl+R - + S M - + &Repeat Playlist &Opakovat seznam skladeb - + Tools Nástroje @@ -1006,194 +1016,194 @@ PlayList - + &Add File Přidat &soubor - + F F - + &Add Directory Přidat &adresář - + D D - + &Remove Selected &Odstranit vybrané - + Del Del - + &Remove All Odstranit &vše - + &Remove Unselected Odstranit &nevybrané - + Remove unavailable files Odstranit nedostupné soubory - + &View Track Details Zobrazit &informace o skladbě - + Alt+I Alt+I - + Sort List Seřadit seznam - - + + By Title Podle názvu skladby - - + + By Album - - + + By Artist - - + + By Filename Podle názvu souboru - - + + By Path + Filename Podle cesty a názvu souboru - - + + By Date Podle data - + Sort Selection Seřadit výběr - + Randomize List Zamíchat seznam - + Reverse List Obrátit pořadí seznamu - + Invert Selection Invertovat výběr - + &Select None &Zrušit výběr - + &Select All &Vybrat vše - + Ctrl+A Ctrl+A - + &New List &Nový seznam - + Shift+N Shift+N - + &Load List Načíst &seznam - + O O - + &Save List &Uložit seznam - + Shift+S Shift+S - + &Add Url Přidat &URL - + U U - - + + By Track Number Podle čísla skladby - + &Queue &Fronta - + Q Q - + Actions Činnosti @@ -1272,7 +1282,7 @@ TextScroller - + Buffering: Načítá se: diff --git a/src/ui/translations/qmmp_de.ts b/src/ui/translations/qmmp_de.ts index 779dc229a..4d8f4a336 100644 --- a/src/ui/translations/qmmp_de.ts +++ b/src/ui/translations/qmmp_de.ts @@ -173,84 +173,84 @@ ConfigDialog - - - - - + + + + + Enabled Aktiviert - - - - - + + + + + Description Beschreibung - - - - - + + + + + Filename Dateiname - + Artist Interpret - + Album Album - + Title Titel - + Track number Stücknummer - + Disc number CD-Nummer - + Genre Genre - + Composer Komponist - + File name Dateiname - + File path Dateipfad - + Year Jahr - + Comment Kommentar @@ -266,7 +266,7 @@ - + Playlist Wiedergabeliste @@ -314,7 +314,7 @@ - + ... ... @@ -324,63 +324,73 @@ Bitmap-Schriftart verwenden, falls verfügbar - + + Skin Options + + + + + Use skin cursors + + + + Metadata Metadaten - + Load metadata from files Metadaten aus Dateien laden - + Song Display Titelanzeige - + Title format: Titelformat: - + Show song numbers Titelnummern anzeigen - + Preferences Konfiguration - - + + Information Information - + Input Eingabe - + Output Ausgabe - + Compatibility Kompatibilität - + Openbox compatibility Openbox-Kompatibilität - + Close Schließen @@ -390,112 +400,112 @@ Verbindung - + File Dialog Datei-Dialog - + Proxy Proxyserver - + Enable proxy usage Proxyserver verwenden - + Proxy host name: Name des Proxyservers: - + Proxy port: Port: - + Use authentication with proxy Authentisierung verwenden - + Proxy user name: Benutzername: - + Proxy password: Passwort: - + Archived skin Archiviertes Design - + Unarchived skin Nicht archiviertes Design - + Visualization Visualisierung - + Effects Effekte - + General Sonstige - + Audio Audio - + Use software volume control Softwaregesteuerte Lautstärkeregelung - + Visibility Control Tray-Steuerung - + Hide on close Beim Schließen in den Systemabschnitt der Kontrollleiste minimieren - + Start hidden Minimiert starten - + Convert underscores to blanks Unterstriche in Leerzeichen umwandeln - + Convert %20 to blanks %20 in Leerzeichen umwandeln - + Select Skin Files Design-Dateien auswählen - + Skin files Design-Dateien @@ -510,29 +520,29 @@ Aktualisieren - + Show protocol Protokoll anzeigen - + Transparency Transparenz - + Main window Hauptfenster - - - + + + 0 0 - + Equalizer Equalizer @@ -540,53 +550,53 @@ EqWidget - - + + preset Voreinstellung - + &Load/Delete &Laden/Löschen - + &Save Preset &Voreinstellung speichern - + &Save Auto-load Preset &Automatische Voreinstellungen speichern - + &Import &Importieren - + &Clear &Zurücksetzen - + Saving Preset Voreinstellung speichern - + Preset name: Name der Voreinstellung: - + preset # Voreinstellung # - + Import Preset Voreinstellung importieren @@ -635,62 +645,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 @@ -832,7 +842,7 @@ MainWindow - + Default Standard @@ -847,118 +857,118 @@ Dateien hinzufügen - + &Play &Wiedergabe - + X X - + &Pause &Pause - + C C - + &Stop &Stopp - + V V - + &Previous &Vorheriger Titel - + Z Z - + &Next &Nächster Titel - + B B - + &Jump To File Springe zu &Titel - + J J - + &Settings &Einstellungen - + Ctrl+P Strg+P - + &About Ü&ber - + &Exit Be&enden - + Ctrl+Q Strg+Q - - + + Playlist Files Wiedergabelisten - + Open Playlist Wiedergabeliste öffnen - + Save Playlist Wiedergabeliste speichern - + Space Leertaste - + &About Qt Übe&r Qt - + &Play/Pause Wieder&gabe/Pause @@ -968,37 +978,37 @@ Alle unterstützten Formate - + &Repeat Track Tite&l wiederholen - + &Shuffle &Zufallswiedergabe - + R R - + Ctrl+R Strg+R - + S S - + &Repeat Playlist W&iedergabeliste wiederholen - + Tools Werkzeuge @@ -1006,194 +1016,194 @@ PlayList - + &Add File &Datei hinzufügen - + F F - + &Add Directory &Verzeichnis hinzufügen - + D D - + &Remove Selected &Ausgewählte entfernen - + Del Entf - + &Remove All Alle &entfernen - + &Remove Unselected &Nicht ausgewählte entfernen - + Remove unavailable files Nichtverfügbare Dateien entfernen - + &View Track Details &Titeldetails anzeigen - + Alt+I Alt+I - + Sort List Wiedergabeliste sortieren - - + + By Title Nach Titel - - + + By Album - - + + By Artist - - + + By Filename Nach Dateinamen - - + + By Path + Filename Nach Pfad + Dateinamen - - + + By Date Nach Datum - + Sort Selection Auswahl sortieren - + Randomize List Wiedergabeliste mischen - + Reverse List Wiedergabeliste umkehren - + Invert Selection Auswahl umkehren - + &Select None &Auswahl aufheben - + &Select All Alle aus&wählen - + Ctrl+A Strg+A - + &New List &Neue Wiedergabeliste - + Shift+N Umschalt+N - + &Load List Wiedergabeliste &laden - + O O - + &Save List Wiedergabeliste &speichern - + Shift+S Umschalt+S - + &Add Url &URL hinzufügen - + U U - - + + By Track Number Nach Titelnummer - + &Queue &Warteschlange - + Q Q - + Actions Aktionen @@ -1272,7 +1282,7 @@ TextScroller - + Buffering: Pufferung: diff --git a/src/ui/translations/qmmp_it.ts b/src/ui/translations/qmmp_it.ts index 4cbab6c63..27bf464ec 100644 --- a/src/ui/translations/qmmp_it.ts +++ b/src/ui/translations/qmmp_it.ts @@ -173,84 +173,84 @@ ConfigDialog - - - - - + + + + + Enabled Attivo - - - - - + + + + + Description Descrizione - - - - - + + + + + Filename File - + Artist Interprete - + Album Album - + Title Titolo - + Track number - + Disc number - + Genre Genere - + Composer - + File name - + File path - + Year Anno - + Comment Commento @@ -288,48 +288,48 @@ - + ... ... - + Metadata Metadati - + Load metadata from files Carica i metadati dai brani - + Song Display Mostra il brano - + Title format: Formato del titolo : - + Input Entrata - + Output Uscita - + Preferences Impostazioni preferite - - + + Information Informazioni @@ -340,7 +340,7 @@ - + Playlist Lista dei brani @@ -355,17 +355,17 @@ Avanzato - + Close Chiudi - + Archived skin Tema archiviato - + Unarchived skin Tema non archiviato @@ -375,27 +375,27 @@ Connettività - + Visualization Visualizzazione - + Effects Effetti - + General Generale - + File Dialog Menu brani - + Audio Audio @@ -410,92 +410,102 @@ - + + Skin Options + + + + + Use skin cursors + + + + Show song numbers - + Use software volume control Utilizza il controllo volume del programma - + Visibility Control Controllo dell'aspetto - + Hide on close Nascondi alla chiusura - + Start hidden Avvia nascosto - + Compatibility Compatibilità - + Openbox compatibility Compatibilità openbox - + Proxy Proxy - + Enable proxy usage Attiva il proxy - + Proxy host name: Nome del server : - + Proxy port: Porta del server : - + Use authentication with proxy Usa autenticazione con il proxy - + Proxy user name: Utente: - + Proxy password: Password : - + Convert underscores to blanks Converti il carattere « _ » in spazi - + Convert %20 to blanks Converti il carattere « %20 » in spazi - + Select Skin Files Seleziona aspetto - + Skin files Aspetto @@ -510,29 +520,29 @@ Aggiorna - + Show protocol Motra protocollo - + Transparency Transparenza - + Main window Finestra principale - - - + + + 0 0 - + Equalizer Equalizzatore @@ -540,53 +550,53 @@ EqWidget - - + + preset Impostazione - + &Load/Delete &Carica/Elimina - + &Save Preset &Salva preimpostazione - + &Save Auto-load Preset &Salvare preimpostazioni caricate automaticamente - + &Clear &Cancella - + Saving Preset Salvataggio preimpostazioni - + Preset name: Nome delle preimpostazioni: - + preset # Preimpostazione # - + &Import &Importa - + Import Preset Importa preimpostazione @@ -635,62 +645,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 @@ -832,7 +842,7 @@ MainWindow - + Default Défault @@ -847,118 +857,118 @@ Seleziona uno o più brani da aprire - + &Play &Esegui - + X X - + &Pause &Pausa - + C C - + &Stop &Arresta - + V V - + &Previous &Precedente - + Z Z - + &Next &Successivo - + B B - + &Jump To File &Vai al brano - + J J - + &Settings &Configurazione - + Ctrl+P Ctrl+P - + &Exit &Esci - + Ctrl+Q Ctrl+Q - + Open Playlist Apri lista di brani - + Save Playlist Salva lista di brani - + &About &Informazioni - - + + Playlist Files Brani della lista - + Space Spazio - + &About Qt &Informazioni su Qt - + &Play/Pause &Esegui / Pausa @@ -968,37 +978,37 @@ Elenco di tutti i tipi di flusso accettati - + &Repeat Track &Ripeti brano - + &Shuffle &Ordine casuale - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist &Ripeti lista brani - + Tools Strumenti @@ -1006,194 +1016,194 @@ PlayList - + F F - + D D - + Alt+I Alt+I - + Ctrl+A Ctrl+A - + O O - + &Add File &Aggiungi brani - + &Add Directory &Aggiungi cartelle - + &Remove Selected &Elimina la selezione - + &Remove All &Elimina tutto - + &Remove Unselected &Elimina i non selezionati - + Remove unavailable files Rimuovi files non disponibili - + &View Track Details &Dettagli della traccia - + Sort List Riordina la lista - - + + By Title Per titolo - - + + By Album - - + + By Artist - - + + By Filename Per titolo del brano - - + + By Path + Filename per percorso più titolo del brano - - + + By Date Per data - + Sort Selection Riordina la selezione - + Randomize List Mescola i brnai della lista - + Reverse List Inverti la lista - + Invert Selection Inverti la selezione - + &Select None &Non scegliere alcun brano - + &Select All &Seleziona tutto - + &New List &Nuova lista - + Shift+N Shift+N - + &Load List &Carica lista - + &Save List &Salva lista - + Shift+S Shift+S - + Del Canc - + &Add Url &Aggiungi URL - + U U - - + + By Track Number Per numero di traccia - + &Queue &Metti in coda - + Q Q - + Actions Azioni @@ -1272,7 +1282,7 @@ TextScroller - + Buffering: Buffer: diff --git a/src/ui/translations/qmmp_lt.ts b/src/ui/translations/qmmp_lt.ts index bcf08bcdf..3b96c6904 100644 --- a/src/ui/translations/qmmp_lt.ts +++ b/src/ui/translations/qmmp_lt.ts @@ -173,84 +173,84 @@ ConfigDialog - - - - - + + + + + Enabled Įjungtas - - - - - + + + + + Description Aprašymas - - - - - + + + + + Filename Bylos pavadinimas - + Artist Atlikėjas - + Album Albumas - + Title Pavadinimas - + Track number - + Disc number - + Composer - + File name - + File path - + Genre Žanras - + Year Metai - + Comment Komentaras @@ -288,48 +288,48 @@ - + ... ... - + Metadata Meta duomenys - + Load metadata from files Įkelti meta duomenis iš bylų - + Song Display Dainų sąrašas - + Title format: Pavadinimo formatas: - + Input Įvestis - + Output Išvestis - + Preferences Nustatymai - - + + Information Informacija @@ -340,7 +340,7 @@ - + Playlist Grojaraštis @@ -355,17 +355,17 @@ Papildomi - + Close Užverti - + Archived skin Suspausta tema - + Unarchived skin Išskleista tema @@ -375,27 +375,27 @@ Tinklas - + Visualization Vizualizacija - + Effects Efektai - + General Bendri - + File Dialog Pasirinkimo langas - + Audio Audio @@ -410,92 +410,102 @@ - + + Skin Options + + + + + Use skin cursors + + + + Show song numbers Rodyti takelių numerius - + Use software volume control Naudoti programinį garso valdymą - + Visibility Control Matomumo valdymas - + Hide on close Paslėpti išjungus - + Start hidden Įjungti paslėptą - + Compatibility Suderinamumas - + Openbox compatibility Openbox suderinamumas - + Proxy Proxy - + Enable proxy usage Įjungti proxy palaikymą - + Proxy host name: Proxy serveris: - + Proxy port: Proxy portas: - + Use authentication with proxy Naudoti proxy autentifikavimą - + Proxy user name: Proxy vartotojo vardas: - + Proxy password: Proxy slaptažodis: - + Convert underscores to blanks Convert underscores to blanks - + Convert %20 to blanks Konvertuoti %20 į tarpus - + Select Skin Files Pasirinkti temų bylas - + Skin files Temų bylos @@ -510,29 +520,29 @@ Atnaujinti - + Show protocol Rodyti protokolą - + Transparency Permatomumas - + Main window Pagrindinis langas - - - + + + 0 - + Equalizer Glodintuvas @@ -540,53 +550,53 @@ EqWidget - - + + preset Nustatymas - + &Load/Delete &Įkelti/Pašalinti - + &Save Preset &Išsaugoti nustatymus - + &Save Auto-load Preset &Išsaugoti auto-nustatymą - + &Clear &išvalyti - + Saving Preset Išsaugojamas nustatymas - + Preset name: Nustatymo pavadinimas: - + preset # Nustatymas # - + &Import &Importuoti - + Import Preset Importuoti nustatymus @@ -635,62 +645,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 @@ -832,7 +842,7 @@ MainWindow - + Default @@ -847,118 +857,118 @@ Pasirinkite vieną ar kelias bylas atvėrimui - + &Play &Groti - + X - + &Pause &Pristabdyti - + C - + &Stop &Sustabdyti - + V - + &Previous &Ankstesnis - + Z - + &Next &Sekantis - + B - + &Jump To File &Pereiti prie bylos - + J - + &Settings &Nustatymai - + Ctrl+P - + &Exit &Išeiti - + Ctrl+Q - + Open Playlist Atverti grojaraštį - + Save Playlist Išsaugoti grojaraštį - + &About &Apie - - + + Playlist Files Grojaraščio bylos - + Space - + &About Qt &Apie Qt - + &Play/Pause &Groti/Pristabdyti @@ -968,37 +978,37 @@ Palaikomi bylų tipai - + &Repeat Track &Kartoti takelį - + &Shuffle &Atsitiktine tvarka - + R - + Ctrl+R - + S - + &Repeat Playlist &Kartoti grojaraštį - + Tools Įrankiai @@ -1006,194 +1016,194 @@ PlayList - + F - + D - + Alt+I - + Ctrl+A - + O - + &Add File &Pridėti bylą - + &Add Directory &Pridėti aplanką - + &Remove Selected &Pašalinti pasirinktus - + &Remove All &Pašalinti visus - + &Remove Unselected &Pašalinti NEpasirinktus - + Remove unavailable files - + &View Track Details &Takelio informacija - + Sort List Rūšiuoti - - + + By Title Pagal dainos pavadinimą - - + + By Album - - + + By Artist - - + + By Filename Pagal bylos pavadinimą - - + + By Path + Filename Pagal kelią iki bylos - - + + By Date Pagal datą - + Sort Selection Rūšiuoti pasirinktus - + Randomize List Sumaišyti sąrašą - + Reverse List Apversti - + Invert Selection Atšaukti pasirinkimą - + &Select None &Nepasirinkti nei vieno - + &Select All &Pasirinkti visus - + &New List &Naujas sąrašas - + Shift+N - + &Load List &Įkelti sąrašą - + &Save List &Išsaugoti sąrašą - + Shift+S - + Del - + &Add Url &Pridėti interneto adresą - + U - - + + By Track Number Pagal takelio numerį - + &Queue &Į eilę - + Q - + Actions Veiksmai @@ -1272,7 +1282,7 @@ TextScroller - + Buffering: Kuriamas buferis: diff --git a/src/ui/translations/qmmp_pl_PL.ts b/src/ui/translations/qmmp_pl_PL.ts index 67aceea7e..2903bb7da 100644 --- a/src/ui/translations/qmmp_pl_PL.ts +++ b/src/ui/translations/qmmp_pl_PL.ts @@ -173,84 +173,84 @@ ConfigDialog - - - - - + + + + + Enabled Włączone - - - - - + + + + + Description Opis - - - - - + + + + + Filename Nazwa pliku - + Artist Artysta - + Album Album - + Title Tytuł - + Track number Numer utworu - + Disc number Numer albumu - + Genre Gatunek - + Composer Kompozytor - + File name Nazwa pliku - + File path Lokalizacja - + Year Rok - + Comment Komentarz @@ -288,48 +288,48 @@ - + ... ... - + Metadata Metadane - + Load metadata from files Załaduj metadane z pliku - + Song Display Wyświetlanie utworu - + Title format: Format tytułu: - + Input Wejście - + Output Wyjście - + Preferences Ustawienia - - + + Information Informacje @@ -340,7 +340,7 @@ - + Playlist Lista odtwarzania @@ -355,17 +355,17 @@ Zaawansowane - + Close Zamknij - + Archived skin Skompresowana skórka - + Unarchived skin Niekompresowana skórka @@ -375,27 +375,27 @@ Sieć - + Visualization Wizualizacje - + Effects Efekty - + General Ogólne - + File Dialog Okno dialogowe - + Audio Dźwięk @@ -410,92 +410,102 @@ Użyj czcionki bitmapowej jeśli jest dostępna - + + Skin Options + + + + + Use skin cursors + + + + Show song numbers Wyświetl numery utworów na liście odtwarzania - + Use software volume control Użyj programowej regulacji głośności - + Visibility Control Sterowanie - + Hide on close Zminimalizuj przy zamykaniu - + Start hidden Uruchom zminimalizowany - + Compatibility Kompatybilność - + Openbox compatibility Zgodność z Openbox - + Proxy Proxy - + Enable proxy usage Włącz proxy - + Proxy host name: Nazwa hosta proxy: - + Proxy port: Port proxy: - + Use authentication with proxy Użyj autoryzacji z proxy - + Proxy user name: Nazwa użytkownika: - + Proxy password: Hasło: - + Convert underscores to blanks Konwertuj podkreślenia na spacje - + Convert %20 to blanks Konwertuj sekwencje %20 na spacje - + Select Skin Files Wybierz skórę - + Skin files Pliki skór @@ -510,29 +520,29 @@ Odśwież - + Show protocol Pokaż protokół - + Transparency Przezroczystość - + Main window Okno główne - - - + + + 0 0 - + Equalizer Equalizer @@ -540,53 +550,53 @@ EqWidget - - + + preset preset - + &Load/Delete Wczytaj/&Usuń - + &Save Preset Zapi&sz Preset - + &Save Auto-load Preset Zapi&sz Auto-ładowanie Preset'u - + &Clear &Wyczyść - + Saving Preset Zapisywanie Preset'u - + Preset name: Nazwa Preset'u: - + preset # preset # - + &Import &Importuj - + Import Preset Importuj Preset @@ -635,62 +645,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 @@ -832,7 +842,7 @@ MainWindow - + Default Domyślne @@ -847,118 +857,118 @@ Wybierz jeden lub więcej plików do otwarcia - + &Play &Odtwarzaj - + X X - + &Pause &Wstrzymaj - + C C - + &Stop &Zatrzymaj - + V V - + &Previous &Poprzedni - + Z Z - + &Next &Następny - + B B - + &Jump To File &Skocz do pliku - + J J - + &Settings &Ustawienia - + Ctrl+P Ctrl+P - + &Exit &Wyjście - + Ctrl+Q Ctrl+Q - + Open Playlist Otwórz listę odtwarzania - + Save Playlist Zapisz listę odtwarzania - + &About &O programie - - + + Playlist Files Pliki listy odtwarzania - + Space - + &About Qt &O Qt - + &Play/Pause &Odtwarzaj/Wstrzymaj @@ -968,37 +978,37 @@ Wszystkie wspierane formaty - + &Repeat Track &Powtórz utwór - + &Shuffle &Losowo - + R - + Ctrl+R - + S - + &Repeat Playlist Powtó&rz listę odtwarzania - + Tools Narzędzia @@ -1006,194 +1016,194 @@ PlayList - + F F - + D D - + Alt+I Alt+I - + Ctrl+A Ctrl+A - + O O - + &Add File &Dodaj plik - + &Add Directory Dodaj &katalog - + &Remove Selected &Usuń zaznaczone - + &Remove All Usuń &wszystkie - + &Remove Unselected Usuń &niezaznaczone - + Remove unavailable files Usuń niedostępne pliki - + &View Track Details &Pokaż informacje o pliku - + Sort List Sortuj listę - - + + By Title Według nazwy - - + + By Album - - + + By Artist - - + + By Filename Według nazwy pliku - - + + By Path + Filename Według Ścieżki + Nazwy pliku - - + + By Date Wg Daty - + Sort Selection Sortuj zaznaczone - + Randomize List Tasuj listę - + Reverse List Odwróć listę - + Invert Selection Odwróć zaznaczenie - + &Select None &Odznacz wszystkie - + &Select All &Zaznacz wszystkie - + &New List &Nowa lista - + Shift+N Shift+N - + &Load List &Ładuj listę - + &Save List &Zapisz listę - + Shift+S Shift+S - + Del Del - + &Add Url Dod&aj Url - + U U - - + + By Track Number Wg numeru utworu - + &Queue &Kolejkuj - + Q Q - + Actions Akcje @@ -1272,7 +1282,7 @@ TextScroller - + Buffering: Buforowanie: diff --git a/src/ui/translations/qmmp_pt_BR.ts b/src/ui/translations/qmmp_pt_BR.ts index d833fa315..b547e17f8 100644 --- a/src/ui/translations/qmmp_pt_BR.ts +++ b/src/ui/translations/qmmp_pt_BR.ts @@ -173,84 +173,84 @@ ConfigDialog - - - - - + + + + + Enabled Ligado - - - - - + + + + + Description Descrição - - - - - + + + + + Filename Nome do Arquivo - + Artist Artista - + Album Álbum - + Title Título - + Track number - + Disc number - + Genre Gênero - + Composer - + File name - + File path - + Year Ano - + Comment Comentário @@ -288,48 +288,48 @@ - + ... ... - + Metadata MetaData - + Load metadata from files Carregar arquivo MetaData - + Song Display Mostrar música - + Title format: Tipo de Formato: - + Input Entrada - + Output Saída - + Preferences Preferências - - + + Information Informações @@ -340,7 +340,7 @@ - + Playlist Lista de músicas @@ -355,17 +355,17 @@ Avançado - + Close Fechar - + Archived skin - + Unarchived skin @@ -375,27 +375,27 @@ - + Visualization - + Effects - + General - + File Dialog - + Audio @@ -410,92 +410,102 @@ - + + Skin Options + + + + + Use skin cursors + + + + Show song numbers - + Use software volume control - + Visibility Control - + Hide on close - + Start hidden - + Compatibility - + Openbox compatibility - + Proxy - + Enable proxy usage - + Proxy host name: - + Proxy port: - + Use authentication with proxy - + Proxy user name: - + Proxy password: - + Convert underscores to blanks - + Convert %20 to blanks - + Select Skin Files - + Skin files @@ -510,29 +520,29 @@ Recarregar - + Show protocol - + Transparency - + Main window - - - + + + 0 - + Equalizer @@ -540,53 +550,53 @@ EqWidget - - + + preset preset - + &Load/Delete &Carregar/Deletar - + &Save Preset %Salvar preset - + &Save Auto-load Preset &Salvar Auto-Carregar preset - + &Clear &Limpar - + Saving Preset Salvando Preset - + Preset name: Nome Preset: - + preset # Preset # - + &Import &Importar - + Import Preset Importar Preset @@ -635,62 +645,62 @@ MainDisplay - + Previous - + Play - + Pause - + Stop - + Next - + Add file - + Equalizer - + Playlist Lista de músicas - + Repeat playlist - + Shuffle - + Volume - + Balance @@ -832,7 +842,7 @@ MainWindow - + Default Padrão @@ -847,118 +857,118 @@ Selecionar um ou mais arquivos - + &Play Tocar - + X - + &Pause Pausar - + C - + &Stop Parar - + V - + &Previous Anterior - + Z - + &Next Próximo - + B - + &Jump To File Pular para arquivo - + J - + &Settings Configurações - + Ctrl+P - + &Exit Sair - + Ctrl+Q - + Open Playlist Abrir Playlist - + Save Playlist Salvar Playlist - + &About &Sobre - - + + Playlist Files ФArquivos de lista de músicas - + Space - + &About Qt - + &Play/Pause @@ -968,37 +978,37 @@ - + &Repeat Track - + &Shuffle - + R - + Ctrl+R - + S - + &Repeat Playlist - + Tools @@ -1006,194 +1016,194 @@ PlayList - + F - + D - + Alt+I - + Ctrl+A - + O - + &Add File &Adicionar arquivo - + &Add Directory &Adicionar Diretorio - + &Remove Selected &Remover selecionadas - + &Remove All &Remover tudo - + &Remove Unselected &Remover não selecionadas - + Remove unavailable files - + &View Track Details &Ver detalhes da Faixa - + Sort List Classificar lista - - + + By Title Por Título - - + + By Album - - + + By Artist - - + + By Filename Por Nome - - + + By Path + Filename Por Dirertório + Nome - - + + By Date Por Data - + Sort Selection Classificar por Seleção - + Randomize List Lista Eleatória - + Reverse List Lista Revertida - + Invert Selection Inverter Seleção - + &Select None &Nenhum selecionado - + &Select All &Selecionar tudo - + &New List &Nova lista - + Shift+N - + &Load List &Carregar lista - + &Save List &Salvar lista - + Shift+S - + Del - + &Add Url - + U - - + + By Track Number - + &Queue Na fila - + Q - + Actions @@ -1272,7 +1282,7 @@ TextScroller - + Buffering: diff --git a/src/ui/translations/qmmp_ru.ts b/src/ui/translations/qmmp_ru.ts index 4b8978801..354908858 100644 --- a/src/ui/translations/qmmp_ru.ts +++ b/src/ui/translations/qmmp_ru.ts @@ -173,84 +173,84 @@ ConfigDialog - - - - - + + + + + Enabled Включён - - - - - + + + + + Description Описание - - - - - + + + + + Filename Имя файла - + Artist Исполнитель - + Album Альбом - + Title Название - + Track number Номер трека - + Disc number Номер диска - + Genre Жанр - + Composer Композитор - + File name Имя файла - + File path Путь к файлу - + Year Год - + Comment Комментарий @@ -288,48 +288,48 @@ - + ... ... - + Metadata Метаданные - + Load metadata from files Считывать метаданные из файлов - + Song Display Список песен - + Title format: Формат названия: - + Input Ввод - + Output Вывод - + Preferences Настройки - - + + Information Информация @@ -340,7 +340,7 @@ - + Playlist Список @@ -355,17 +355,17 @@ Дополнительно - + Close Закрыть - + Archived skin Упакованная тема - + Unarchived skin Распакованная тема @@ -375,27 +375,27 @@ Сеть - + Visualization Визуализация - + Effects Эффекты - + General Общие - + File Dialog Файловый диалог - + Audio Аудио @@ -410,92 +410,102 @@ Использовать растровые шрифты, если возможно - + + Skin Options + + + + + Use skin cursors + + + + Show song numbers Показывать номера песен - + Use software volume control Использовать программную регулировку громкости - + Visibility Control Управление видимостью - + Hide on close Скрывать при закрытии - + Start hidden Запускать скрытым - + Compatibility Совместимость - + Openbox compatibility Совместимость с Openbox - + Proxy Прокси - + Enable proxy usage Использовать прокси - + Proxy host name: Прокси сервер: - + Proxy port: Прокси порт: - + Use authentication with proxy Использовать авторизацию на прокси - + Proxy user name: Имя пользователя прокси: - + Proxy password: Пароль прокси: - + Convert underscores to blanks Преобразовывать подчёркивание в пробел - + Convert %20 to blanks Преобразовывать %20 в пробел - + Select Skin Files Выберите файлы обложек - + Skin files Файлы обложек @@ -510,29 +520,29 @@ Обновить - + Show protocol Показывать протокол - + Transparency Прозрачность - + Main window Главное окно - - - + + + 0 - + Equalizer Эквалайзер @@ -540,53 +550,53 @@ EqWidget - - + + preset предустановка - + &Load/Delete &Загрузить/Удалить - + &Save Preset &Сохранить предустановку - + &Save Auto-load Preset &Сохранить авто-предустановку - + &Clear &Очистить - + Saving Preset Сохранение предустановки - + Preset name: Имя предустановки: - + preset # предустановка # - + &Import &Импортировать - + Import Preset Импорт предустановки @@ -635,62 +645,62 @@ MainDisplay - + Previous Предыдущий фрагмент - + Play Воспроизвести - + Pause Приостановить - + Stop Стоп - + Next Следующий фрагмент - + Add file Добавить файл - + Equalizer Эквалайзер - + Playlist Список - + Repeat playlist Повторять список - + Shuffle В случайном порядке - + Volume Громкость - + Balance Баланс @@ -832,7 +842,7 @@ MainWindow - + Default @@ -847,118 +857,118 @@ Выберите один или несколько файлов - + &Play &Воспроизвести - + X - + &Pause &Приостановить - + C - + &Stop &Стоп - + V - + &Previous &Предыдущий фрагмент - + Z - + &Next &Следующий фрагмент - + B - + &Jump To File &Перейти к файлу - + J - + &Settings &Настройки - + Ctrl+P - + &Exit &Выход - + Ctrl+Q - + Open Playlist Открыть список - + Save Playlist Сохранить список - + &About &О программе - - + + Playlist Files Файлы списков - + Space - + &About Qt &О библиотеке Qt - + &Play/Pause &Воспр/приост @@ -968,37 +978,37 @@ Все форматы - + &Repeat Track &Повторять трек - + &Shuffle &В случайном порядке - + R - + Ctrl+R - + S - + &Repeat Playlist &Повторять список - + Tools Сервис @@ -1006,194 +1016,194 @@ PlayList - + F - + D - + Alt+I - + Ctrl+A - + O - + &Add File &Добавить файл - + &Add Directory &Добавить директорию - + &Remove Selected &Удалить выделенное - + &Remove All &Удалить всё - + &Remove Unselected &Удалить невыделенное - + Remove unavailable files Удалить недоступные файлы - + &View Track Details &Информация - + Sort List Сортировать - - + + By Title По названию - - + + By Album По альбому - - + + By Artist По исполнителю - - + + By Filename По имени файла - - + + By Path + Filename По пути и файлу - - + + By Date По дате - + Sort Selection Сортировать выделенное - + Randomize List Перемешать - + Reverse List Перевернуть - + Invert Selection Инвертировать выделение - + &Select None &Снять выделение - + &Select All &Выделить всё - + &New List &Новый лист - + Shift+N - + &Load List &Загрузить лист - + &Save List &Сохранить лист - + Shift+S - + Del - + &Add Url &Добавить URL - + U - - + + By Track Number По номеру трека - + &Queue &В очередь - + Q - + Actions Действия @@ -1272,7 +1282,7 @@ TextScroller - + Buffering: Буферизация: diff --git a/src/ui/translations/qmmp_tr.ts b/src/ui/translations/qmmp_tr.ts index ee6886954..a49091cbf 100644 --- a/src/ui/translations/qmmp_tr.ts +++ b/src/ui/translations/qmmp_tr.ts @@ -173,84 +173,84 @@ ConfigDialog - - - - - + + + + + Enabled Etkinleştirildi - - - - - + + + + + Description Açıklama - - - - - + + + + + Filename Dosya adı - + Artist Sanatçı - + Album Albüm - + Title Başlık - + Track number - + Disc number - + Genre Tarz - + Composer - + File name - + File path - + Year Yıl - + Comment Yorum @@ -288,48 +288,48 @@ - + ... ... - + Metadata Veri bilgisi - + Load metadata from files Veri bilgisini dosyadan yükle - + Song Display Şarkı Göstergesi - + Title format: Başlık formatı: - + Input Giriş - + Output Çıkış - + Preferences Tercihler - - + + Information Bilgi @@ -340,7 +340,7 @@ - + Playlist Çalma Listesi @@ -355,17 +355,17 @@ Gelişmiş - + Close Kapat - + Archived skin Arşivlenmiş kabuk - + Unarchived skin Arşivlenmemiş kabuk @@ -375,27 +375,27 @@ Bağlanırlık - + Visualization Görsellik - + Effects Efektler - + General Genel - + File Dialog Dosya Diyaloğu - + Audio Ses @@ -410,92 +410,102 @@ - + + Skin Options + + + + + Use skin cursors + + + + Show song numbers Şarkı numaralarını göster - + Use software volume control Yazılımsal ses kontrolünü kullan - + Visibility Control Görünürlük Kontrolü - + Hide on close Kapatınca saklan - + Start hidden Gizli başlat - + Compatibility Uyumluluk - + Openbox compatibility Openbox uyumluluğu - + Proxy Vekil sunucu - + Enable proxy usage Vekil sunucu kullanımını etkinleştir - + Proxy host name: Vekil sunucu adı: - + Proxy port: Vekil sunucu portu: - + Use authentication with proxy Vekil sunucu yetkilendirmesi kullan - + Proxy user name: Vekil sunucu kullanıcı adı: - + Proxy password: Vekil sunucu parolası: - + Convert underscores to blanks Alt çizgileri boşluğa çevir - + Convert %20 to blanks %20 yi boşluğa çevir - + Select Skin Files Kabuk Dosyası Seç - + Skin files Kabuk dosyaları @@ -510,29 +520,29 @@ Yenile - + Show protocol Protokolü göster - + Transparency Transparanlık - + Main window Ana pencere - - - + + + 0 0 - + Equalizer Ekolayzır @@ -540,53 +550,53 @@ EqWidget - - + + preset tanımlanmış ayar - + &Load/Delete &Yükle/Sil - + &Save Preset Tanımlanmış &Ayarları Kaydet - + &Save Auto-load Preset &Otomatik Tanımlanmış Ayarları Kaydet - + &Clear &Temizle - + Saving Preset Tanımlanmış Ayarla Kaydediliyor - + Preset name: Tanımlanmış ayar adı: - + preset # tanımlanmış ayar # - + &Import &İçe Aktar - + Import Preset Tanımlanmış Ayarları Al @@ -635,62 +645,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 @@ -832,7 +842,7 @@ MainWindow - + Default Öntanımlı @@ -847,118 +857,118 @@ Açmak için bir yada daha çok dosya seçin - + &Play &Çal - + X X - + &Pause &Duraklat - + C C - + &Stop &Durdur - + V V - + &Previous &Önceki - + Z Z - + &Next &Sonraki - + B B - + &Jump To File &Parçaya Git - + J J - + &Settings &Ayarlar - + Ctrl+P Ctrl+P - + &Exit &Çıkış - + Ctrl+Q Ctrl+Q - + Open Playlist Çalma Listesini Aç - + Save Playlist Çalma Listesini Kaydet - + &About &Hakkında - - + + Playlist Files Çalma Listesi Dosyaları - + Space Boşluk - + &About Qt &Qt Hakkında - + &Play/Pause &Oynat/Duraklat @@ -968,37 +978,37 @@ Tüm Desteklenen Bitstreamler - + &Repeat Track &Parçayı Yinele - + &Shuffle &Rastgele - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist &Çalma Listesini Yinele - + Tools Araçlar @@ -1006,194 +1016,194 @@ PlayList - + F F - + D D - + Alt+I Alt+I - + Ctrl+A Ctrl+A - + O O - + &Add File &Dosya Ekle - + &Add Directory &Dizin Ekle - + &Remove Selected &Seçileni Kaldır - + &Remove All &Hepsini Kaldır - + &Remove Unselected &Seçilmemişleri Kaldır - + Remove unavailable files - + &View Track Details &Parça Detaylarını Göster - + Sort List Listeyi Sınıflandır - - + + By Title Başlığa Göre - - + + By Album - - + + By Artist - - + + By Filename Dosya Adına Göre - - + + By Path + Filename Dosya Yolu + Dosya Adına Göre - - + + By Date Tarihe Göre - + Sort Selection Seçilenleri Sınıflandır - + Randomize List Rastgele Listele - + Reverse List Listeyi Ters Çevir - + Invert Selection Seçimi Tersine Çevir - + &Select None &Hiçbirini Seçme - + &Select All &Tümünü Seç - + &New List &Yeni Liste - + Shift+N Shift+N - + &Load List &Liste Yükle - + &Save List &Listeyi Kaydet - + Shift+S Shift+S - + Del Del - + &Add Url &Url Ekle - + U U - - + + By Track Number Parça Numarasına Göre - + &Queue &Kuyruğa ekle - + Q Q - + Actions Eylemler @@ -1272,7 +1282,7 @@ TextScroller - + Buffering: Arabelleğe alınıyor: diff --git a/src/ui/translations/qmmp_uk_UA.ts b/src/ui/translations/qmmp_uk_UA.ts index 7f8f39482..4fd5e9523 100644 --- a/src/ui/translations/qmmp_uk_UA.ts +++ b/src/ui/translations/qmmp_uk_UA.ts @@ -173,84 +173,84 @@ ConfigDialog - - - - - + + + + + Enabled Увімкнено - - - - - + + + + + Description Пояснення - - - - - + + + + + Filename Ім'я файлу - + Artist Виконавець - + Album Альбом - + Title Назва - + Track number Номер треку - + Disc number Номер диску - + Genre Жанр - + Composer Композитор - + File name Ім'я файлу - + File path Шлях файлу - + Year Рік - + Comment Коментар @@ -288,48 +288,48 @@ - + ... ... - + Metadata Метадані - + Load metadata from files Зчитувати метадані з файлів - + Song Display Список пісень - + Title format: Формат назви: - + Input Введення - + Output Виведення - + Preferences Налаштування - - + + Information Інформація @@ -340,7 +340,7 @@ - + Playlist Список @@ -355,17 +355,17 @@ Додатково - + Close Закрити - + Archived skin Упакована тема - + Unarchived skin Розпакована тема @@ -375,27 +375,27 @@ Мережа - + Visualization Візуалізація - + Effects Ефекти - + General Загальне - + File Dialog Файловий діалог - + Audio Звук @@ -410,92 +410,102 @@ Використовувати растрові шрифти, якщо доступні - + + Skin Options + + + + + Use skin cursors + + + + Show song numbers Відображати номера пісень - + Use software volume control Використовувати програмний контроль гучності - + Visibility Control Керування видимістю - + Hide on close Ховати при закритті - + Start hidden Запускати схованим - + Compatibility Сумісність - + Openbox compatibility Сумісність з Openbox - + Proxy Проксі - + Enable proxy usage Використосувати проксі - + Proxy host name: Сервер проксі: - + Proxy port: Порт проксі: - + Use authentication with proxy Використовувати авторизацію на проксі - + Proxy user name: Ім'я користвача проксі: - + Proxy password: Пароль проксі: - + Convert underscores to blanks Конвертувати підкреслювання в пробіл - + Convert %20 to blanks Конвертувати %20 в пробіл - + Select Skin Files Вибрати файли скінів - + Skin files Файли скінів @@ -510,29 +520,29 @@ Поновити - + Show protocol Показати протокол - + Transparency Прозорість - + Main window Головне вікно - - - + + + 0 - + Equalizer Еквалайзер @@ -540,53 +550,53 @@ EqWidget - - + + preset предвстановлення - + &Load/Delete &Завантажити/Видалити - + &Save Preset &Зберегти предвстановлення - + &Save Auto-load Preset &Зберегти авто-предвстановлення - + &Clear &Очистити - + Saving Preset Збережені предвстановлення - + Preset name: Ім'я предвстановлення: - + preset # предвстановлення # - + &Import &Імпортувати - + Import Preset Імпорт предвстановлення @@ -635,62 +645,62 @@ MainDisplay - + Previous Назад - + Play Відтворити - + Pause Пауза - + Stop Стоп - + Next Вперед - + Add file Додати файл - + Equalizer Еквалайзер - + Playlist Список - + Repeat playlist Повторити список - + Shuffle Перемішати - + Volume Гучність - + Balance Баланс @@ -832,7 +842,7 @@ MainWindow - + Default За умовчанням @@ -847,118 +857,118 @@ Виберіть один чи кілька файлів - + &Play &Відтворити - + X - + &Pause &Пауза - + C - + &Stop &Стоп - + V - + &Previous &Назад - + Z - + &Next &Вперед - + B - + &Jump To File &Перейти до файлу - + J - + &Settings &Налаштування - + Ctrl+P - + &Exit &Вихід - + Ctrl+Q - + Open Playlist Відкрити список - + Save Playlist Зберегти список - + &About &Про програму - - + + Playlist Files Файли списків - + Space - + &About Qt &Про Qt - + &Play/Pause &Грати/Пауза @@ -968,37 +978,37 @@ Усі формати - + &Repeat Track &Повторити трек - + &Shuffle &Перемішати - + R - + Ctrl+R - + S - + &Repeat Playlist &Повторити список - + Tools Утиліти @@ -1006,194 +1016,194 @@ PlayList - + F - + D - + Alt+I - + Ctrl+A - + O - + &Add File &Додати файл - + &Add Directory &Додати теку - + &Remove Selected &Видалити вибране - + &Remove All &Видалити все - + &Remove Unselected &Видалити не вибране - + Remove unavailable files Видалити недоступні файли - + &View Track Details &Інформація - + Sort List Сортувати - - + + By Title За назвою - - + + By Album За альбомом - - + + By Artist За артистом - - + + By Filename За ім'ям файлу - - + + By Path + Filename За шляхом та файлом - - + + By Date За датою - + Sort Selection Сортувати вибране - + Randomize List Перемішати - + Reverse List Перевернути - + Invert Selection Інвертувати вибране - + &Select None &Зняти виділення - + &Select All &Вибрати все - + &New List &Новий список - + Shift+N - + &Load List &Завантажити список - + &Save List &Зберегти список - + Shift+S - + Del - + &Add Url &Додати адресу - + U - - + + By Track Number - + &Queue &В чергу - + Q - + Actions Дії @@ -1272,7 +1282,7 @@ TextScroller - + Buffering: Буферизація: diff --git a/src/ui/translations/qmmp_zh_CN.ts b/src/ui/translations/qmmp_zh_CN.ts index 9bf359c6b..7bdfa2213 100644 --- a/src/ui/translations/qmmp_zh_CN.ts +++ b/src/ui/translations/qmmp_zh_CN.ts @@ -173,84 +173,84 @@ ConfigDialog - - - - - + + + + + Enabled 启用 - - - - - + + + + + Description 描述 - - - - - + + + + + Filename 文件名 - + Artist 艺术家 - + Album 专辑 - + Title 标题 - + Track number - + Disc number - + Genre 流派 - + Composer - + File name - + File path - + Year 年代 - + Comment 备注 @@ -288,48 +288,48 @@ - + ... ... - + Metadata 元数据 - + Load metadata from files 从文件载入元数据 - + Song Display 显示歌曲 - + Title format: 标题格式： - + Input 输入 - + Output 输出 - + Preferences 参数设置 - - + + Information 信息 @@ -340,7 +340,7 @@ - + Playlist 播放列表 @@ -355,17 +355,17 @@ 高级 - + Close 关闭 - + Archived skin 压缩皮肤 - + Unarchived skin 未压缩皮肤 @@ -375,27 +375,27 @@ 连接 - + Visualization 可视化 - + Effects 特效 - + General 常规 - + File Dialog 文件对话 - + Audio 音频 @@ -410,92 +410,102 @@ - + + Skin Options + + + + + Use skin cursors + + + + Show song numbers 显示曲目编号 - + Use software volume control 使用软设备音量控制 - + Visibility Control 可见性控制 - + Hide on close 关闭时隐藏 - + Start hidden 启动时隐藏 - + Compatibility - + Openbox compatibility - + Proxy 代理 - + Enable proxy usage 启用代理 - + Proxy host name: 主机名： - + Proxy port: 端口： - + Use authentication with proxy 需要身份验证 - + Proxy user name: 用户名： - + Proxy password: 密码： - + Convert underscores to blanks 转换下划线为空格 - + Convert %20 to blanks 转换 %20 为空格 - + Select Skin Files 选择皮肤文件 - + Skin files 皮肤文件 @@ -510,29 +520,29 @@ 刷新 - + Show protocol 显示协议 - + Transparency 透明度 - + Main window 主窗口 - - - + + + 0 0 - + Equalizer 均衡器 @@ -540,53 +550,53 @@ EqWidget - - + + preset 预设 - + &Load/Delete 载入/删除(&L) - + &Save Preset 保存预设(&S) - + &Save Auto-load Preset 保存自动载入预设(&S) - + &Clear 清除(&C) - + Saving Preset 保存预设 - + Preset name: 预设名称： - + preset # 预设 # - + &Import 导入(&I) - + Import Preset 导入预设 @@ -635,62 +645,62 @@ MainDisplay - + Previous 上一曲 - + Play 播放 - + Pause 暂停 - + Stop 停止 - + Next 下一曲 - + Add file 添加文件 - + Equalizer 均衡器 - + Playlist 播放列表 - + Repeat playlist 重复播放列表 - + Shuffle 乱序 - + Volume 音量 - + Balance 平衡 @@ -832,7 +842,7 @@ MainWindow - + Default 默认 @@ -847,118 +857,118 @@ 选择打开一个或更多文件 - + &Play 播放(&P) - + X X - + &Pause 暂停(&P) - + C C - + &Stop 停止(&S) - + V V - + &Previous 上一曲(&P) - + Z Z - + &Next 下一曲(&N) - + B B - + &Jump To File 跳到文件(&J) - + J J - + &Settings 设置(&S) - + Ctrl+P Ctrl+P - + &Exit 退出(&E) - + Ctrl+Q Ctrl+Q - + Open Playlist 打开播放列表 - + Save Playlist 保存播放列表 - + &About 关于(&A) - - + + Playlist Files 播放列表文件 - + Space 空格 - + &About Qt 关于 Qt (&A) - + &Play/Pause 播放/暂停(&P) @@ -968,37 +978,37 @@ 支持的全部文件 - + &Repeat Track 重复音轨(&R) - + &Shuffle 乱序(&S) - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist 重复播放列表(&R) - + Tools 工具 @@ -1006,194 +1016,194 @@ PlayList - + F F - + D D - + Alt+I Alt+I - + Ctrl+A Ctrl+A - + O O - + &Add File 添加文件(&A) - + &Add Directory 添加文件夹(&A) - + &Remove Selected 删除所选(&R) - + &Remove All 删除全部(&R) - + &Remove Unselected 删除未选(&R) - + Remove unavailable files - + &View Track Details 查看音轨详细信息(&V) - + Sort List 列表排序 - - + + By Title 按标题 - - + + By Album - - + + By Artist - - + + By Filename 按文件名 - - + + By Path + Filename 按路径+文件名 - - + + By Date 按日期 - + Sort Selection 选择排序 - + Randomize List 随机产生列表 - + Reverse List 逆序列表 - + Invert Selection 反选 - + &Select None 无选择(&S) - + &Select All 选择全部(&S) - + &New List 新建列表(&N) - + Shift+N Shift+N - + &Load List 载入列表(&L) - + &Save List 保存列表(&S) - + Shift+S Shift+S - + Del Del - + &Add Url 添加 URL (&A) - + U U - - + + By Track Number 按音轨 - + &Queue 队列(&Q) - + Q Q - + Actions 动作 @@ -1272,7 +1282,7 @@ TextScroller - + Buffering: 缓冲： diff --git a/src/ui/translations/qmmp_zh_TW.ts b/src/ui/translations/qmmp_zh_TW.ts index a78f3593b..ca6fc894e 100644 --- a/src/ui/translations/qmmp_zh_TW.ts +++ b/src/ui/translations/qmmp_zh_TW.ts @@ -173,84 +173,84 @@ ConfigDialog - - - - - + + + + + Enabled 啟用 - - - - - + + + + + Description 說明 - - - - - + + + + + Filename 檔名 - + Artist 藝術家 - + Album 專輯 - + Title 標題 - + Track number - + Disc number - + Genre 流派 - + Composer - + File name - + File path - + Year 年代 - + Comment 備註 @@ -288,48 +288,48 @@ - + ... ... - + Metadata 元資料 - + Load metadata from files 從檔案載入元資料 - + Song Display 察看歌曲 - + Title format: 標題格式： - + Input 匯入 - + Output 匯出 - + Preferences 引數設定 - - + + Information 資訊 @@ -340,7 +340,7 @@ - + Playlist 播放清單 @@ -355,17 +355,17 @@ 進階 - + Close 關閉 - + Archived skin 封包皮膚 - + Unarchived skin 未封包皮膚 @@ -375,27 +375,27 @@ 連線 - + Visualization 可視化 - + Effects 特效 - + General 常規 - + File Dialog 檔案對話 - + Audio 聲訊 @@ -410,92 +410,102 @@ - + + Skin Options + + + + + Use skin cursors + + + + Show song numbers 顯示曲目編號 - + Use software volume control 使用軟裝置音量控制 - + Visibility Control 可見性控制 - + Hide on close 關閉時隱藏 - + Start hidden 啟動時隱藏 - + Compatibility - + Openbox compatibility - + Proxy 代理 - + Enable proxy usage 啟用代理 - + Proxy host name: 主機名： - + Proxy port: 通訊埠： - + Use authentication with proxy 需要身份驗證 - + Proxy user name: 用戶名： - + Proxy password: 密碼： - + Convert underscores to blanks 轉換底線為空格 - + Convert %20 to blanks 轉換 %20 為空格 - + Select Skin Files 選取皮膚檔案 - + Skin files 皮膚檔案 @@ -510,29 +520,29 @@ 刷新 - + Show protocol 顯示協議 - + Transparency 透明度 - + Main window 主窗口 - - - + + + 0 0 - + Equalizer 均衡器 @@ -540,53 +550,53 @@ EqWidget - - + + preset 預設 - + &Load/Delete 載入/移除(&L) - + &Save Preset 儲存預設(&S) - + &Save Auto-load Preset 儲存自動載入預設(&S) - + &Clear 清除(&C) - + Saving Preset 儲存預設 - + Preset name: 預設名稱： - + preset # 預設 # - + &Import 導入(&I) - + Import Preset 導入預設 @@ -635,62 +645,62 @@ MainDisplay - + Previous 上一曲 - + Play 播放 - + Pause 暫停 - + Stop 停止 - + Next 下一曲 - + Add file 添加檔案 - + Equalizer 均衡器 - + Playlist 播放清單 - + Repeat playlist 重復播放清單 - + Shuffle 亂序 - + Volume 音量 - + Balance 平衡 @@ -832,7 +842,7 @@ MainWindow - + Default 預設 @@ -847,118 +857,118 @@ 選取開啟一個或更多檔案 - + &Play 播放(&P) - + X X - + &Pause 暫停(&P) - + C C - + &Stop 停止(&S) - + V V - + &Previous 上一曲(&P) - + Z Z - + &Next 下一曲(&N) - + B B - + &Jump To File 跳到檔案(&J) - + J J - + &Settings 設定(&S) - + Ctrl+P Ctrl+P - + &Exit 結束(&E) - + Ctrl+Q Ctrl+Q - + Open Playlist 開啟播放清單 - + Save Playlist 儲存播放清單 - + &About 關於(&A) - - + + Playlist Files 播放清單檔案 - + Space 空格 - + &About Qt 關於 Qt (&A) - + &Play/Pause 播放/暫停(&P) @@ -968,37 +978,37 @@ 支援的全部檔案 - + &Repeat Track 重復音軌(&R) - + &Shuffle 亂序(&S) - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist 重復播放清單(&R) - + Tools 工具 @@ -1006,194 +1016,194 @@ PlayList - + F F - + D D - + Alt+I Alt+I - + Ctrl+A Ctrl+A - + O O - + &Add File 添加檔案(&A) - + &Add Directory 添加檔案夾(&A) - + &Remove Selected 移除所選(&R) - + &Remove All 移除全部(&R) - + &Remove Unselected 移除未選(&R) - + Remove unavailable files - + &View Track Details 檢視音軌詳細資訊(&V) - + Sort List 清單排序 - - + + By Title 按標題 - - + + By Album - - + + By Artist - - + + By Filename 按檔名 - - + + By Path + Filename 按路徑+檔名 - - + + By Date 按日期 - + Sort Selection 選取排序 - + Randomize List 隨機產生清單 - + Reverse List 逆串列表 - + Invert Selection 反選 - + &Select None 無選取(&S) - + &Select All 選取全部(&S) - + &New List 新建清單(&N) - + Shift+N Shift+N - + &Load List 載入清單(&L) - + &Save List 儲存清單(&S) - + Shift+S Shift+S - + Del Del - + &Add Url 添加 URL (&A) - + U U - - + + By Track Number 按音軌 - + &Queue 佇列(&Q) - + Q Q - + Actions 動作 @@ -1272,7 +1282,7 @@ TextScroller - + Buffering: 緩衝： diff --git a/src/ui/volumebar.cpp b/src/ui/volumebar.cpp index 685f049ec..91c94379f 100644 --- a/src/ui/volumebar.cpp +++ b/src/ui/volumebar.cpp @@ -32,7 +32,7 @@ VolumeBar::VolumeBar(QWidget *parent) : PixmapWidget(parent) { - m_skin = Skin::getPointer(); + m_skin = Skin::instance(); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); setPixmap(m_skin->getVolumeBar(0)); mw = qobject_cast(window()); -- cgit v1.2.3-13-gbd6f