From 2702b572ba44364ec1bfc59d635790f00e709591 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 4 Nov 2009 13:36:43 +0000 Subject: fixed some ui bugs git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1354 90c681e8-e032-0410-971d-27865f9a5e38 --- src/ui/cursorimage.cpp | 2 +- src/ui/eqgraph.cpp | 12 +-- src/ui/eqgraph.h | 17 ++- src/ui/eqtitlebar.cpp | 3 +- src/ui/eqwidget.cpp | 2 +- src/ui/mainvisual.cpp | 36 +++---- src/ui/mainvisual.h | 20 ++-- src/ui/mainwindow.cpp | 3 +- src/ui/pixmapwidget.cpp | 2 +- src/ui/playlist.cpp | 45 +++++--- src/ui/playlist.h | 3 + src/ui/playlistcontrol.cpp | 31 +++--- src/ui/playlistcontrol.h | 23 ++-- src/ui/playlisttitlebar.cpp | 13 +-- src/ui/playlisttitlebar.h | 2 +- src/ui/shadedbar.cpp | 19 ++-- src/ui/shadedbar.h | 7 +- src/ui/shadedvisual.cpp | 24 ++--- src/ui/shadedvisual.h | 5 +- src/ui/skin.cpp | 2 +- src/ui/titlebar.cpp | 10 +- src/ui/titlebarcontrol.cpp | 29 +++-- src/ui/titlebarcontrol.h | 6 +- src/ui/translations/qmmp_cs.ts | 218 +++++++++++++++++++------------------- src/ui/translations/qmmp_de.ts | 218 +++++++++++++++++++------------------- src/ui/translations/qmmp_it.ts | 218 +++++++++++++++++++------------------- src/ui/translations/qmmp_lt.ts | 218 +++++++++++++++++++------------------- src/ui/translations/qmmp_pl_PL.ts | 218 +++++++++++++++++++------------------- src/ui/translations/qmmp_pt_BR.ts | 216 ++++++++++++++++++------------------- src/ui/translations/qmmp_ru.ts | 218 +++++++++++++++++++------------------- src/ui/translations/qmmp_tr.ts | 218 +++++++++++++++++++------------------- src/ui/translations/qmmp_uk_UA.ts | 218 +++++++++++++++++++------------------- src/ui/translations/qmmp_zh_CN.ts | 218 +++++++++++++++++++------------------- src/ui/translations/qmmp_zh_TW.ts | 218 +++++++++++++++++++------------------- 34 files changed, 1361 insertions(+), 1351 deletions(-) (limited to 'src') diff --git a/src/ui/cursorimage.cpp b/src/ui/cursorimage.cpp index aa51b172d..904a0568a 100644 --- a/src/ui/cursorimage.cpp +++ b/src/ui/cursorimage.cpp @@ -12,7 +12,7 @@ QCursor createCursor(QString path) { if (path.isEmpty()) - return QCursor(); + return QCursor(); // read file headers QFile curFile(path); diff --git a/src/ui/eqgraph.cpp b/src/ui/eqgraph.cpp index de41a53b7..1d7d070f7 100644 --- a/src/ui/eqgraph.cpp +++ b/src/ui/eqgraph.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2008 by Ilya Kotov * + * Copyright (C) 2006-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -28,6 +28,7 @@ EQGraph::EQGraph (QWidget *parent) m_skin = Skin::instance(); setPixmap (m_skin->getEqPart (Skin::EQ_GRAPH)); clear(); + m_ratio = m_skin->ratio(); draw(); connect (m_skin, SIGNAL (skinChanged()), this, SLOT (updateSkin())); setVisible(!m_skin->getEqPart (Skin::EQ_GRAPH).isNull()); @@ -107,7 +108,7 @@ void EQGraph::draw() { QPixmap pixmap = m_skin->getEqPart (Skin::EQ_GRAPH); if (pixmap.isNull()) - pixmap = QPixmap(113,19); + pixmap = QPixmap(113*m_ratio,19*m_ratio); if (m_values.size()!=10) { @@ -125,7 +126,7 @@ void EQGraph::draw() } init_spline (x, bands, 10, yf); - for (i = 0; i < 109; i++) + for (i = 0; i < 113; i++) { y = 9 - (int) ((eval_spline (x, bands, yf, 10, i) * 9.0) / 20.0); if (y < 0) @@ -147,9 +148,7 @@ void EQGraph::draw() py = y; QPainter paint (&pixmap); - paint.drawPixmap (i, y, m_skin->getEqSpline (y)) ; - - + paint.drawPixmap (i*m_ratio, y*m_ratio, m_skin->getEqSpline (y)); } setPixmap (pixmap); delete [] bands; @@ -157,6 +156,7 @@ void EQGraph::draw() void EQGraph::updateSkin() { + m_ratio = m_skin->ratio(); draw(); setVisible(!m_skin->getEqPart (Skin::EQ_GRAPH).isNull()); } diff --git a/src/ui/eqgraph.h b/src/ui/eqgraph.h index 4f6bf1882..96e5db521 100644 --- a/src/ui/eqgraph.h +++ b/src/ui/eqgraph.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Ilya Kotov * + * Copyright (C) 2006-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -22,34 +22,31 @@ #include "pixmapwidget.h" +class Skin; /** @author Ilya Kotov */ - -class Skin; - class EQGraph : public PixmapWidget { Q_OBJECT public: - EQGraph ( QWidget *parent = 0 ); + EQGraph (QWidget *parent = 0); ~EQGraph(); - void addValue ( int ); + void addValue (int); void clear(); -/*protected: - void paintEvent ( QPaintEvent * );*/ private slots: void updateSkin(); private: QList m_values; Skin *m_skin; - void init_spline ( double * x, double * y, int n, double * y2 ); - double eval_spline ( double xa[], double ya[], double y2a[], int n, double x ); + void init_spline (double * x, double * y, int n, double * y2); + double eval_spline (double xa[], double ya[], double y2a[], int n, double x); void draw(); + int m_ratio; }; diff --git a/src/ui/eqtitlebar.cpp b/src/ui/eqtitlebar.cpp index 9ca14cd91..ea0bd1c8b 100644 --- a/src/ui/eqtitlebar.cpp +++ b/src/ui/eqtitlebar.cpp @@ -151,8 +151,7 @@ void EqTitleBar::shade() connect(m_volumeBar, SIGNAL(sliderMoved(int)),SLOT(updateVolume())); m_balanceBar = new ShadedBar(this, Skin::EQ_BALANCE1, Skin::EQ_BALANCE2, Skin::EQ_BALANCE3); m_balanceBar->move(r*164,r*4); - m_balanceBar->setFixedSize(r*42,r*7); - m_balanceBar->setRange(-100*r,r*100); + m_balanceBar->setRange(-100, 100); m_balanceBar->show(); connect(m_balanceBar, SIGNAL(sliderMoved(int)),SLOT(updateVolume())); setVolume(m_left, m_right); //show current volume and balance diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp index 42efdaf5e..a83d3a7d2 100644 --- a/src/ui/eqwidget.cpp +++ b/src/ui/eqwidget.cpp @@ -44,7 +44,7 @@ EqWidget::EqWidget (QWidget *parent) setPixmap (m_skin->getEqPart (Skin::EQ_MAIN)); setCursor (m_skin->getCursor (Skin::CUR_EQNORMAL)); m_titleBar = new EqTitleBar (this); - m_titleBar -> move (0,0); + m_titleBar->move (0,0); connect (m_skin, SIGNAL (skinChanged()), this, SLOT (updateSkin())); m_preamp = new EqSlider (this); diff --git a/src/ui/mainvisual.cpp b/src/ui/mainvisual.cpp index 142618751..a0a64982b 100644 --- a/src/ui/mainvisual.cpp +++ b/src/ui/mainvisual.cpp @@ -22,25 +22,23 @@ #include #include #include - #include -#include +#include #include #include - #include "skin.h" #include "fft.h" #include "inlines.h" #include "mainvisual.h" -MainVisual *MainVisual::pointer = 0; +MainVisual *MainVisual::m_instance = 0; -MainVisual *MainVisual::getPointer() +MainVisual *MainVisual::instance() { - if (!pointer) - qFatal ("MainVisual: this object not created!"); - return pointer; + if (!m_instance) + qFatal ("MainVisual: this object is not created!"); + return m_instance; } MainVisual::MainVisual (QWidget *parent) @@ -54,7 +52,7 @@ MainVisual::MainVisual (QWidget *parent) m_nodes.clear(); createMenu(); readSettings(); - pointer = this; + m_instance = this; } MainVisual::~MainVisual() @@ -71,6 +69,7 @@ MainVisual::~MainVisual() settings.setValue("Visualization/rate", 1000/m_timer->interval()); while (!m_nodes.isEmpty()) delete m_nodes.takeFirst(); + m_instance = 0; } void MainVisual::setVisual (VisualBase *newvis) @@ -586,11 +585,12 @@ Scope::Scope() { clear(); m_skin = Skin::instance(); + m_ratio = m_skin->ratio(); } void Scope::clear() { - for (int i = 0; i< 75; ++i) + for (int i = 0; i< 76; ++i) m_intern_vis_data[i] = 7; } @@ -602,10 +602,10 @@ bool Scope::process(VisualNode *node) if (!node) return FALSE; - int step = (node->length << 8)/74; + int step = (node->length << 8)/76; int pos = 0; - for (int i = 0; i < 75; ++i) + for (int i = 0; i < 76; ++i) { pos += step; m_intern_vis_data[i] = (node->left[pos >> 8] >> 12); @@ -620,15 +620,15 @@ bool Scope::process(VisualNode *node) void Scope::draw(QPainter *p) { - for (int i = 0; i<73; ++i) + for (int i = 0; i<75; ++i) { - int h1 = 10 - m_intern_vis_data[i]; - int h2 = 10 - m_intern_vis_data[i+1]; + int h1 = 8 - m_intern_vis_data[i]; + int h2 = 8 - m_intern_vis_data[i+1]; if (h1 > h2) qSwap(h1, h2); - p->setPen (m_skin->getVisColor(19 + (10 - h2)/2)); - p->drawLine(i, h1, i, h2); + p->setPen (m_skin->getVisColor(19 + (8 - h2)/2)); + p->drawLine(i*m_ratio, h1*m_ratio, (i+1)*m_ratio, h2*m_ratio); } - for (int i = 0; i< 75; ++i) + for (int i = 0; i< 76; ++i) m_intern_vis_data[i] = 0; } diff --git a/src/ui/mainvisual.h b/src/ui/mainvisual.h index e4dd13ec1..02fbc7fba 100644 --- a/src/ui/mainvisual.h +++ b/src/ui/mainvisual.h @@ -23,17 +23,14 @@ #include #include #include - #include "logscale.h" class QSettings; class QTimer; class QMenu; class QActionGroup; - class Buffer; - class VisualNode { public: @@ -57,8 +54,7 @@ public: class VisualBase { public: - virtual ~VisualBase() - {}; + virtual ~VisualBase(){} virtual void clear() = 0; virtual bool process(VisualNode *node) = 0; virtual void draw(QPainter *) = 0; @@ -75,10 +71,8 @@ public: MainVisual( QWidget *parent = 0); virtual ~MainVisual(); - static MainVisual *getPointer(); - - void setVisual( VisualBase *newvis ); - + static MainVisual *instance(); + void setVisual(VisualBase *newvis); void add(Buffer *, unsigned long, int, int); void clear(); void paintEvent(QPaintEvent *); @@ -98,7 +92,7 @@ private: void drawBackGround(); void createMenu(); void readSettings(); - static MainVisual *pointer; + static MainVisual *m_instance; VisualBase *m_vis; QPixmap m_pixmap; QPixmap m_bg; @@ -154,18 +148,18 @@ class Scope : public VisualBase public: Scope(); virtual ~Scope(); - void clear(); bool process(VisualNode *node); void draw(QPainter *p); const QString name() { return "Scope"; - }; + } private: - int m_intern_vis_data[75]; + int m_intern_vis_data[76]; Skin *m_skin; + int m_ratio; }; } diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index d1e7042d1..638eddf5c 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -104,7 +104,7 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option createActions(); //prepare visualization Visual::initialize(this, m_visMenu, SLOT(updateActions())); - m_vis = MainVisual::getPointer(); + m_vis = MainVisual::instance(); Visual::add(m_vis); //connections connect (m_playlist,SIGNAL(next()),SLOT(next())); @@ -136,7 +136,6 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option m_display->setEQ(m_equalizer); m_display->setPL(m_playlist); dock->updateDock(); - //m_playListModel->readSettings(); m_playListModel->doCurrentVisibleRequest(); updateEQ(); #ifndef Q_OS_WIN32 diff --git a/src/ui/pixmapwidget.cpp b/src/ui/pixmapwidget.cpp index 77566b162..2384caaa3 100644 --- a/src/ui/pixmapwidget.cpp +++ b/src/ui/pixmapwidget.cpp @@ -38,7 +38,7 @@ void PixmapWidget::setPixmap(const QPixmap pixmap) update(); } -void PixmapWidget::paintEvent (QPaintEvent *) +void PixmapWidget::paintEvent (QPaintEvent *e) { QPainter paint(this); paint.drawPixmap(0,0, m_pixmap); diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp index 2bad71a74..18ef48cf1 100644 --- a/src/ui/playlist.cpp +++ b/src/ui/playlist.cpp @@ -53,12 +53,14 @@ PlayList::PlayList (QWidget *parent) m_skin = Skin::instance(); m_ratio = m_skin->ratio(); createMenus(); - resize (275*m_ratio, 116*m_ratio); - m_listWidget = new ListWidget (this); - m_plslider = new PlayListSlider (this); + m_shaded = FALSE; + resize (275*m_ratio, 116*m_ratio); setSizeIncrement (25*m_ratio, 29*m_ratio); + setMinimumSize(275*m_ratio, 116*m_ratio); + m_listWidget = new ListWidget (this); + m_plslider = new PlayListSlider (this); m_buttonAdd = new Button (this,Skin::PL_BT_ADD,Skin::PL_BT_ADD, Skin::CUR_PNORMAL); m_buttonSub = new Button (this,Skin::PL_BT_SUB,Skin::PL_BT_SUB, Skin::CUR_PNORMAL); m_selectButton = new Button (this,Skin::PL_BT_SEL,Skin::PL_BT_SEL, Skin::CUR_PNORMAL); @@ -68,7 +70,6 @@ PlayList::PlayList (QWidget *parent) m_resizeWidget->resize(25,25); m_resizeWidget->setCursor(m_skin->getCursor (Skin::CUR_PSIZE)); m_pl_control = new PlaylistControl (this); - m_pl_control->move (0,0); m_length_totalLength = new SymbolDisplay (this,14); m_length_totalLength->setAlignment (Qt::AlignLeft); @@ -112,8 +113,8 @@ void PlayList::updatePositions() if (sx < 0 || sy < 0) //skip shaded mode return; - setMinimumSize (275*m_ratio, 116*m_ratio); - setBaseSize (275*m_ratio,116*m_ratio); + /*setMinimumSize (275*m_ratio, 116*m_ratio); + setBaseSize (275*m_ratio,116*m_ratio);*/ m_titleBar->resize (275*m_ratio+25*sx, 20*m_ratio); m_plslider->resize (20*m_ratio, 58*m_ratio+sy*29); @@ -357,10 +358,8 @@ void PlayList::drawPixmap (int sx, int sy) { paint.drawPixmap (125*m_ratio+i*25,78*m_ratio+sy*29,m_skin->getPlPart (Skin::PL_SFILL1)); } - paint.drawPixmap (125*m_ratio+sx*25,78*m_ratio+sy*29,m_skin->getPlPart (Skin::PL_RSBAR)); paint.end(); - } void PlayList::resizeEvent (QResizeEvent *) @@ -536,17 +535,29 @@ void PlayList::updateSkin() { setCursor(m_skin->getCursor(Skin::CUR_PNORMAL)); // TODO shaded m_resizeWidget->setCursor(m_skin->getCursor (Skin::CUR_PSIZE)); - if(m_ratio != m_skin->ratio()) //update minimal size if needed + m_ratio = m_skin->ratio(); + setMinimalMode(m_shaded); +} + +void PlayList::setMinimalMode(bool b) +{ + if(!m_shaded) + m_height = height(); + m_shaded = b; + if(m_shaded) { - int prev = m_ratio; //save previous ratio - m_ratio = m_skin->ratio(); - if(height() < 116*prev) //minimal mode - setMinimumSize (275*m_ratio, 14*m_ratio); - else - setMinimumSize (275*m_ratio, 116*m_ratio); - setBaseSize (275*m_ratio,116*m_ratio); + m_height = height(); + setSizeIncrement (25*m_ratio, 1); + setMinimumSize (275*m_ratio, 14*m_ratio); + resize(width(), 14*m_ratio); + } + else + { + setMinimumSize(275*m_ratio, 116*m_ratio); + resize (width(), m_height); setSizeIncrement (25*m_ratio, 29*m_ratio); - updatePositions(); + } + updatePositions(); update(); } diff --git a/src/ui/playlist.h b/src/ui/playlist.h index 5219d7bbf..2d17a59d4 100644 --- a/src/ui/playlist.h +++ b/src/ui/playlist.h @@ -56,6 +56,7 @@ class PlayList : public QWidget { return m_listWidget; } + void setMinimalMode(bool b = TRUE); signals: void play(); @@ -115,6 +116,8 @@ class PlayList : public QWidget bool m_resize; bool m_update; int m_ratio; + int m_height; + bool m_shaded; KeyboardManager* m_keyboardManager; protected: diff --git a/src/ui/playlistcontrol.cpp b/src/ui/playlistcontrol.cpp index 07ba0b16f..9f6f1cb60 100644 --- a/src/ui/playlistcontrol.cpp +++ b/src/ui/playlistcontrol.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Ilya Kotov * + * Copyright (C) 2006-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -22,40 +22,37 @@ #include #include -#include "playlistcontrol.h" +#include "playlistcontrol.h" #include "skin.h" PlaylistControl::PlaylistControl(QWidget* parent) : PixmapWidget(parent) { m_skin = Skin::instance(); - connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); -} - -void PlaylistControl::paintEvent(QPaintEvent *) -{ - QPainter painter(this); - painter.drawPixmap(0,0,m_skin->getPlPart(Skin::PL_CONTROL)); + setPixmap(m_skin->getPlPart(Skin::PL_CONTROL)); + m_ratio = m_skin->ratio(); + connect(m_skin, SIGNAL(skinChanged()), SLOT(updateSkin())); } void PlaylistControl::mouseReleaseEvent(QMouseEvent *me) { QPoint pt = me->pos(); - if(QRect(4,1,7,7).contains(pt)) + if(QRect(4*m_ratio,m_ratio,7*m_ratio,7*m_ratio).contains(pt)) emit previousClicked(); - else if(QRect(12,1,7,7).contains(pt)) + else if(QRect(12*m_ratio,m_ratio,7*m_ratio,7*m_ratio).contains(pt)) emit playClicked(); - else if(QRect(21,1,7,7).contains(pt)) + else if(QRect(21*m_ratio,m_ratio,7*m_ratio,7*m_ratio).contains(pt)) emit pauseClicked(); - else if(QRect(31,1,7,7).contains(pt)) + else if(QRect(31*m_ratio,m_ratio,7*m_ratio,7*m_ratio).contains(pt)) emit stopClicked(); - else if(QRect(40,1,7,7).contains(pt)) + else if(QRect(40*m_ratio,m_ratio,7*m_ratio,7*m_ratio).contains(pt)) emit nextClicked(); - else if(QRect(49,1,7,7).contains(pt)) + else if(QRect(49*m_ratio,m_ratio,7*m_ratio,7*m_ratio).contains(pt)) emit ejectClicked(); } void PlaylistControl::updateSkin() { - setCursor(m_skin->getCursor(Skin::CUR_PNORMAL)); - update(); + setCursor(m_skin->getCursor(Skin::CUR_PNORMAL)); + setPixmap(m_skin->getPlPart(Skin::PL_CONTROL)); + m_ratio = m_skin->ratio(); } diff --git a/src/ui/playlistcontrol.h b/src/ui/playlistcontrol.h index 87e7b27f7..6c0ed0eaf 100644 --- a/src/ui/playlistcontrol.h +++ b/src/ui/playlistcontrol.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Ilya Kotov * + * Copyright (C) 2006-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,26 +18,25 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ - /** - @author Vladimir Kuznetsov - */ - #ifndef _PALYLISTCONTROL_H #define _PALYLISTCONTROL_H #include "pixmapwidget.h" +class QMouseEvent; class PaintEvent; class Skin; -class QMouseEvent; + /** + @author Vladimir Kuznetsov + */ class PlaylistControl : public PixmapWidget { Q_OBJECT public: PlaylistControl(QWidget* parent = 0); - void paintEvent(QPaintEvent*); - void mouseReleaseEvent(QMouseEvent*); + + signals: void previousClicked(); void nextClicked(); @@ -45,10 +44,14 @@ signals: void playClicked(); void stopClicked(); void ejectClicked(); -protected: - Skin* m_skin; + private slots: void updateSkin(); + +private: + void mouseReleaseEvent(QMouseEvent*); + int m_ratio; + Skin* m_skin; }; #endif diff --git a/src/ui/playlisttitlebar.cpp b/src/ui/playlisttitlebar.cpp index e084ce31d..52d606bea 100644 --- a/src/ui/playlisttitlebar.cpp +++ b/src/ui/playlisttitlebar.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Ilya Kotov * + * Copyright (C) 2007-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -23,7 +23,6 @@ #include #include #include - #include "dock.h" #include "button.h" #include "playlisttitlebar.h" @@ -56,7 +55,7 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent) readSettings(); QSettings settings (Qmmp::configFile(), QSettings::IniFormat); - m_pl->resize (settings.value ("PlayList/size", QSize (275, 116)).toSize()); + m_pl->resize (settings.value ("PlayList/size", QSize (m_ratio*275, m_ratio*116)).toSize()); if (settings.value ("PlayList/shaded", FALSE).toBool()) shade(); resize(m_pl->width(),height()); @@ -224,11 +223,9 @@ void PlayListTitleBar::updateSkin() void PlayListTitleBar::shade() { m_shaded = !m_shaded; - if (m_shaded) { m_height = m_pl->height(); - m_pl->setFixedHeight(14*m_ratio); m_shade->hide(); m_shade2 = new Button(this, Skin::PL_BT_SHADE2_N, Skin::PL_BT_SHADE2_P, Skin::CUR_PWSNORM); m_shade2->move(254,3); @@ -237,13 +234,11 @@ void PlayListTitleBar::shade() } else { - m_pl->setMinimumSize (275*m_ratio,116*m_ratio); - m_pl->setMaximumSize (10000,10000); - m_pl->resize(width(),m_height); m_shade2->deleteLater(); m_shade2 = 0; m_shade->show(); } + m_pl->setMinimalMode(m_shaded); showCurrent(); update(); if (m_align) @@ -266,9 +261,7 @@ void PlayListTitleBar::showCurrent() else m_text.clear(); } - QFontMetrics metrics(m_font); m_truncatedText = metrics.elidedText (m_text, Qt::ElideRight, width() - 35*m_ratio); - updatePixmap(); } diff --git a/src/ui/playlisttitlebar.h b/src/ui/playlisttitlebar.h index 3762db61c..cde01c3c6 100644 --- a/src/ui/playlisttitlebar.h +++ b/src/ui/playlisttitlebar.h @@ -64,8 +64,8 @@ private: Button* m_shade2; bool m_shaded; bool m_align, m_resize; - int m_height; int m_ratio; + int m_height; PlayListModel* m_model; QString m_text; QString m_truncatedText; diff --git a/src/ui/shadedbar.cpp b/src/ui/shadedbar.cpp index 97e5ded94..dec2b79fd 100644 --- a/src/ui/shadedbar.cpp +++ b/src/ui/shadedbar.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007 by Ilya Kotov * + * Copyright (C) 2007-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -22,9 +22,7 @@ #include #include #include - #include "skin.h" - #include "shadedbar.h" ShadedBar::ShadedBar(QWidget *parent, uint slider1, uint slider2, uint slider3) @@ -33,9 +31,12 @@ ShadedBar::ShadedBar(QWidget *parent, uint slider1, uint slider2, uint slider3) m_slider1 = slider1; m_slider2 = slider2; m_slider3 = slider3; - setFixedSize(97,7); - //setAutoFillBackground (TRUE); m_skin = Skin::instance(); + m_ratio = m_skin->ratio(); + if(slider1 == Skin::EQ_VOLUME1) + resize(m_ratio*97,m_ratio*7); + else + resize(m_ratio*42,m_ratio*7); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); m_moving = FALSE; m_min = 0; @@ -51,7 +52,6 @@ ShadedBar::~ShadedBar() void ShadedBar::mousePressEvent(QMouseEvent *e) { - m_moving = TRUE; press_pos = e->x(); if(m_posx() && e->x()ratio(); + if(m_slider1 == Skin::EQ_VOLUME1) + resize(m_ratio*97,m_ratio*7); + else + resize(m_ratio*42,m_ratio*7); draw(); } @@ -121,7 +126,7 @@ void ShadedBar::draw() m_pixmap = m_skin->getEqPart(m_slider2); else m_pixmap = m_skin->getEqPart(m_slider3); - m_pos = int(ceil(double(m_value-m_min)*(width()-3)/(m_max-m_min))); + m_pos = int(ceil(double(m_value-m_min)*(width()-3*m_ratio)/(m_max-m_min))); update(); } diff --git a/src/ui/shadedbar.h b/src/ui/shadedbar.h index 4ea8c871f..09272e9e1 100644 --- a/src/ui/shadedbar.h +++ b/src/ui/shadedbar.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007 by Ilya Kotov * + * Copyright (C) 2007-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -24,10 +24,8 @@ class QMouseEvent; class QPaintEvent; - class Skin; - /** @author Ilya Kotov */ @@ -41,7 +39,7 @@ public: int value() { return m_value; - }; + } int isPressed() { return m_moving; @@ -66,6 +64,7 @@ private: int convert(int); // value = convert(position); void draw(); uint m_slider1, m_slider2, m_slider3; + int m_ratio; protected: void mousePressEvent(QMouseEvent*); diff --git a/src/ui/shadedvisual.cpp b/src/ui/shadedvisual.cpp index f7380da52..d58f96fa1 100644 --- a/src/ui/shadedvisual.cpp +++ b/src/ui/shadedvisual.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Ilya Kotov * + * Copyright (C) 2007-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -23,16 +23,14 @@ #include "skin.h" #include "mainvisual.h" #include "inlines.h" - - #include "shadedvisual.h" -ShadedVisual::ShadedVisual(QWidget *parent) - : Visual(parent) -{ - setFixedSize(38,5); - m_pixmap = QPixmap (38,5); +ShadedVisual::ShadedVisual(QWidget *parent) : Visual(parent) +{ m_skin = Skin::instance(); + m_ratio = m_skin->ratio(); + resize(m_ratio*38,m_ratio*5); + m_pixmap = QPixmap (m_ratio*38,m_ratio*5); m_timer = new QTimer(this); connect(m_timer, SIGNAL (timeout()), this, SLOT (timeout())); connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); @@ -41,7 +39,6 @@ ShadedVisual::ShadedVisual(QWidget *parent) clear(); } - ShadedVisual::~ShadedVisual() {} @@ -92,7 +89,7 @@ void ShadedVisual::clear() m_r = 0; m_pixmap.fill(m_skin->getVisColor(0)); update(); -}; +} void ShadedVisual::timeout() { @@ -164,11 +161,11 @@ void ShadedVisual::draw (QPainter *p) { for (int i = 0; i < m_l; ++i) { - p->fillRect (i*3, 0, 3, 2, QBrush(m_skin->getVisColor (17-i))); + p->fillRect (i*3*m_ratio, 0, 3*m_ratio, 2*m_ratio, QBrush(m_skin->getVisColor (17-i))); } for (int i = 0; i < m_r; ++i) { - p->fillRect (i*3, 3, 3, 2, QBrush(m_skin->getVisColor (17-i))); + p->fillRect (i*3*m_ratio, 3*m_ratio, 3*m_ratio, 2*m_ratio, QBrush(m_skin->getVisColor (17-i))); } } @@ -190,5 +187,8 @@ void ShadedVisual::showEvent (QShowEvent *) void ShadedVisual::updateSkin() { + m_ratio = m_skin->ratio(); + resize(m_ratio*38,m_ratio*5); + m_pixmap = QPixmap (m_ratio*38,m_ratio*5); clear(); } diff --git a/src/ui/shadedvisual.h b/src/ui/shadedvisual.h index b1820a484..3c1cb30db 100644 --- a/src/ui/shadedvisual.h +++ b/src/ui/shadedvisual.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Ilya Kotov * + * Copyright (C) 2007-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -20,14 +20,12 @@ #ifndef SHADEDVISUAL_H #define SHADEDVISUAL_H - #include #include #include class QTimer; class QPixmap; - class Skin; class VisualNode; @@ -63,6 +61,7 @@ private: QPixmap m_pixmap; QList m_nodes; double m_l, m_r; + int m_ratio; }; diff --git a/src/ui/skin.cpp b/src/ui/skin.cpp index 177fd4450..b43ff06dc 100644 --- a/src/ui/skin.cpp +++ b/src/ui/skin.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Ilya Kotov * + * Copyright (C) 2007-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * Based on Promoe, an XMMS2 Client * diff --git a/src/ui/titlebar.cpp b/src/ui/titlebar.cpp index 130d46d28..7f438dcd0 100644 --- a/src/ui/titlebar.cpp +++ b/src/ui/titlebar.cpp @@ -191,16 +191,16 @@ void TitleBar::shade() updatePositions(); } -QString TitleBar::formatTime ( int sec ) +QString TitleBar::formatTime (int sec) { int minutes = sec / 60; int seconds = sec % 60; - QString str_minutes = QString::number ( minutes ); - QString str_seconds = QString::number ( seconds ); + QString str_minutes = QString::number (minutes); + QString str_seconds = QString::number (seconds); - if ( minutes < 10 ) str_minutes.prepend ( "0" ); - if ( seconds < 10 ) str_seconds.prepend ( "0" ); + if (minutes < 10) str_minutes.prepend ("0"); + if (seconds < 10) str_seconds.prepend ("0"); return str_minutes + ":" + str_seconds; } diff --git a/src/ui/titlebarcontrol.cpp b/src/ui/titlebarcontrol.cpp index 8238c287a..8f339602b 100644 --- a/src/ui/titlebarcontrol.cpp +++ b/src/ui/titlebarcontrol.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007 by Ilya Kotov * + * Copyright (C) 2007-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -19,14 +19,15 @@ ***************************************************************************/ #include - +#include "skin.h" #include "titlebarcontrol.h" -TitleBarControl::TitleBarControl(QWidget *parent) - : QWidget(parent) +TitleBarControl::TitleBarControl(QWidget *parent) : QWidget(parent) { //setAutoFillBackground(TRUE); - setFixedSize(57,10); + m_ratio = Skin::instance()->ratio(); + resize(m_ratio*57, m_ratio*10); + connect(Skin::instance(), SIGNAL(skinChanged()),SLOT(updateSkin())); } @@ -40,19 +41,25 @@ void TitleBarControl::mousePressEvent (QMouseEvent *) void TitleBarControl::mouseReleaseEvent (QMouseEvent * event) { QPoint pt = event->pos(); - if(QRect(0,0,8,10).contains(pt)) + if(QRect(0,0,m_ratio*8,m_ratio*10).contains(pt)) emit previousClicked(); - else if(QRect(8,0,11,10).contains(pt)) + else if(QRect(m_ratio*8,0,m_ratio*11,m_ratio*10).contains(pt)) emit playClicked(); - else if(QRect(19,0,10,10).contains(pt)) + else if(QRect(m_ratio*19,0,m_ratio*10,m_ratio*10).contains(pt)) emit pauseClicked(); - else if(QRect(29,0,8,10).contains(pt)) + else if(QRect(m_ratio*29,0,m_ratio*8,m_ratio*10).contains(pt)) emit stopClicked(); - else if(QRect(37,0,10,10).contains(pt)) + else if(QRect(m_ratio*37,0,m_ratio*10,m_ratio*10).contains(pt)) emit nextClicked(); - else if(QRect(47,0,10,10).contains(pt)) + else if(QRect(m_ratio*47,0,m_ratio*10,m_ratio*10).contains(pt)) emit ejectClicked(); } void TitleBarControl::mouseMoveEvent(QMouseEvent*) {} + +void TitleBarControl::updateSkin() +{ + m_ratio = Skin::instance()->ratio(); + resize(m_ratio*57, m_ratio*10); +} diff --git a/src/ui/titlebarcontrol.h b/src/ui/titlebarcontrol.h index c368b2186..3631cce1d 100644 --- a/src/ui/titlebarcontrol.h +++ b/src/ui/titlebarcontrol.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007 by Ilya Kotov * + * Copyright (C) 2007-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -47,7 +47,11 @@ protected: void mouseReleaseEvent(QMouseEvent*); void mouseMoveEvent(QMouseEvent*); +private slots: + void updateSkin(); +private: + int m_ratio; }; diff --git a/src/ui/translations/qmmp_cs.ts b/src/ui/translations/qmmp_cs.ts index e574a6943..5c64529fe 100644 --- a/src/ui/translations/qmmp_cs.ts +++ b/src/ui/translations/qmmp_cs.ts @@ -713,132 +713,132 @@ MainVisual - + Visualization Mode Režim vizualizace - + Analyzer Frekvenční analýza - + Scope Osciloskop - + Off Vypnuto - + Analyzer Mode Režim analýzy - + Normal Normální - + Fire Oheň - + Vertical Lines Sloupce - + Lines Úzké - + Bars Široké - + Peaks Špičky - + Refresh Rate Obnovovací frekvence - + 50 fps 50 Hz - + 25 fps 25 Hz - + 10 fps 10 Hz - + 5 fps 5 Hz - + Analyzer Falloff Pokles analyzátoru - - + + Slowest Nejpomalejší - - + + Slow Pomalý - - + + Medium Střední - - + + Fast Rychlý - - + + Fastest Nejrychlejší - + Peaks Falloff Pokles špiček - + Background Pozadí - + Transparent Průhledné @@ -847,173 +847,173 @@ MainWindow - + Default Seznam - + Choose a directory Výběr adresáře - + Select one or more files to open 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 - + All Supported Bitstreams 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 @@ -1021,194 +1021,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 diff --git a/src/ui/translations/qmmp_de.ts b/src/ui/translations/qmmp_de.ts index 8a6e10ac0..6d2f5036e 100644 --- a/src/ui/translations/qmmp_de.ts +++ b/src/ui/translations/qmmp_de.ts @@ -713,132 +713,132 @@ MainVisual - + Visualization Mode Visualisierungsmodus - + Analyzer Analyzer - + Scope Oszilloskop - + Off Aus - + Analyzer Mode Analyzer-Modus - + Normal Normal - + Fire Feuer - + Vertical Lines Vertikale Linien - + Lines Linien - + Bars Balken - + Peaks Spitzen - + Refresh Rate Wiederholfrequenz - + 50 fps 50 fps - + 25 fps 25 fps - + 10 fps 10 fps - + 5 fps 5 fps - + Analyzer Falloff Analyzer-Abfall - - + + Slowest Sehr langsam - - + + Slow Langsam - - + + Medium Mittel - - + + Fast Schnell - - + + Fastest Sehr schnell - + Peaks Falloff Peaks-Abfall - + Background Hintergrund - + Transparent Transparent @@ -847,173 +847,173 @@ MainWindow - + Default Standard - + Choose a directory Verzeichnis wählen - + Select one or more files to open 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 - + All Supported Bitstreams 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 @@ -1021,194 +1021,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 diff --git a/src/ui/translations/qmmp_it.ts b/src/ui/translations/qmmp_it.ts index 1dd459f59..5b394f413 100644 --- a/src/ui/translations/qmmp_it.ts +++ b/src/ui/translations/qmmp_it.ts @@ -713,132 +713,132 @@ MainVisual - + Visualization Mode Modo visualizzazione - + Analyzer Analizzatore - + Scope Oscilloscopio - + Off Chiudi - + Analyzer Mode Modo analizzatore - + Normal Normale - + Fire Fuoco - + Vertical Lines Linee verticali - + Lines Linee - + Bars Barre - + Peaks Picchi - + Refresh Rate Velocità di aggiornamento - + 50 fps 50 fps - + 25 fps 25 fps - + 10 fps 10 fps - + 5 fps 5 fps - + Analyzer Falloff Ricaduta analizzatore - - + + Slowest Molto lenta - - + + Slow Lenta - - + + Medium Media - - + + Fast Rapida - - + + Fastest Molto veloce - + Peaks Falloff Ricadua picchi - + Background Sfondo - + Transparent Transparente @@ -847,173 +847,173 @@ MainWindow - + Default Défault - + Choose a directory Scegliere una cartella - + Select one or more files to open 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 - + All Supported Bitstreams 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 @@ -1021,194 +1021,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 diff --git a/src/ui/translations/qmmp_lt.ts b/src/ui/translations/qmmp_lt.ts index e29dd4ce9..830cd69c3 100644 --- a/src/ui/translations/qmmp_lt.ts +++ b/src/ui/translations/qmmp_lt.ts @@ -713,132 +713,132 @@ MainVisual - + Visualization Mode Vizualizacijos metodas - + Analyzer Analizatorius - + Scope Scope - + Off Išjungta - + Analyzer Mode Analizatoriaus metodas - + Normal Įprastinis - + Fire Ugnis - + Vertical Lines Vertikalios linijos - + Lines Linijos - + Bars Bangos - + Peaks Pikai - + Refresh Rate Atnaujinimo dažnumas - + 50 fps - + 25 fps - + 10 fps - + 5 fps - + Analyzer Falloff Analyzer Falloff - - + + Slowest Lėčiausias - - + + Slow Lėtas - - + + Medium - - + + Fast Greitas - - + + Fastest Greičiausias - + Peaks Falloff Peaks Falloff - + Background Fonas - + Transparent Permatomumas @@ -847,173 +847,173 @@ MainWindow - + Default - + Choose a directory Pasirinkite aplanką - + Select one or more files to open 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 - + All Supported Bitstreams Palaikomi bylų tipai - + &Repeat Track &Kartoti takelį - + &Shuffle &Atsitiktine tvarka - + R - + Ctrl+R - + S - + &Repeat Playlist &Kartoti grojaraštį - + Tools Įrankiai @@ -1021,194 +1021,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 diff --git a/src/ui/translations/qmmp_pl_PL.ts b/src/ui/translations/qmmp_pl_PL.ts index ca488dc3f..6030e286b 100644 --- a/src/ui/translations/qmmp_pl_PL.ts +++ b/src/ui/translations/qmmp_pl_PL.ts @@ -713,132 +713,132 @@ MainVisual - + Visualization Mode Tryb wizualizacji - + Analyzer Analizator - + Scope - + Off Wyłączone - + Analyzer Mode Tryb Analizatora - + Normal Normalny - + Fire Ogień - + Vertical Lines Pionowe Linie - + Lines Linie - + Bars Słupki - + Peaks Piki - + Refresh Rate Odświeżanie - + 50 fps - + 25 fps - + 10 fps - + 5 fps - + Analyzer Falloff Prędkość Analizatora - - + + Slowest Najwolniej - - + + Slow Wolno - - + + Medium Średnio - - + + Fast Szybko - - + + Fastest Najszybciej - + Peaks Falloff Opadanie Pików - + Background Tło - + Transparent Przezroczystość @@ -847,173 +847,173 @@ MainWindow - + Default Domyślne - + Choose a directory Wybierz katalog - + Select one or more files to open 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 - + All Supported Bitstreams Wszystkie wspierane formaty - + &Repeat Track &Powtórz utwór - + &Shuffle &Losowo - + R - + Ctrl+R - + S - + &Repeat Playlist Powtó&rz listę odtwarzania - + Tools Narzędzia @@ -1021,194 +1021,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 diff --git a/src/ui/translations/qmmp_pt_BR.ts b/src/ui/translations/qmmp_pt_BR.ts index 5bd59e057..3fca099ac 100644 --- a/src/ui/translations/qmmp_pt_BR.ts +++ b/src/ui/translations/qmmp_pt_BR.ts @@ -713,132 +713,132 @@ MainVisual - + Visualization Mode - + Analyzer - + Scope - + Off - + Analyzer Mode - + Normal - + Fire - + Vertical Lines - + Lines - + Bars - + Peaks - + Refresh Rate - + 50 fps - + 25 fps - + 10 fps - + 5 fps - + Analyzer Falloff + + + + Slowest + + - Slowest + Slow - Slow + Medium - Medium + Fast - Fast - - - - - Fastest - + Peaks Falloff - + Background - + Transparent @@ -847,173 +847,173 @@ MainWindow - + Default Padrão - + Choose a directory Escolher o diretorio - + Select one or more files to open 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 - + All Supported Bitstreams - + &Repeat Track - + &Shuffle - + R - + Ctrl+R - + S - + &Repeat Playlist - + Tools @@ -1021,194 +1021,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 diff --git a/src/ui/translations/qmmp_ru.ts b/src/ui/translations/qmmp_ru.ts index 0304c30b0..9f062ebda 100644 --- a/src/ui/translations/qmmp_ru.ts +++ b/src/ui/translations/qmmp_ru.ts @@ -713,132 +713,132 @@ MainVisual - + Visualization Mode Режим визуализации - + Analyzer Анализатор - + Scope Осциллограф - + Off Выключено - + Analyzer Mode Режим анализатора - + Normal Обычный - + Fire Огонь - + Vertical Lines Вертикальные линии - + Lines Линии - + Bars Полоски - + Peaks Пики - + Refresh Rate Частота обновления - + 50 fps - + 25 fps - + 10 fps - + 5 fps - + Analyzer Falloff Падение анализатора - - + + Slowest Самое медленное - - + + Slow Медленное - - + + Medium Среднее - - + + Fast Быстрое - - + + Fastest Самое быстрое - + Peaks Falloff Падение пиков - + Background Фон - + Transparent Прозрачность @@ -847,173 +847,173 @@ MainWindow - + Default - + Choose a directory Выберите директорию - + Select one or more files to open Выберите один или несколько файлов - + &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 &Воспр/приост - + All Supported Bitstreams Все форматы - + &Repeat Track &Повторять трек - + &Shuffle &В случайном порядке - + R - + Ctrl+R - + S - + &Repeat Playlist &Повторять список - + Tools Сервис @@ -1021,194 +1021,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 Действия diff --git a/src/ui/translations/qmmp_tr.ts b/src/ui/translations/qmmp_tr.ts index 21de0dd00..8e6b3ff2b 100644 --- a/src/ui/translations/qmmp_tr.ts +++ b/src/ui/translations/qmmp_tr.ts @@ -713,132 +713,132 @@ MainVisual - + Visualization Mode Görselleştirme Modu - + Analyzer Çözümleyici - + Scope Kapsam - + Off Kapat - + Analyzer Mode Çözümleyici Modu - + Normal Normal - + Fire Ateş - + Vertical Lines Dikey Satırlar - + Lines Satırlar - + Bars Çubuklar - + Peaks Tepeler - + Refresh Rate Tazeleme Oranı - + 50 fps 50 fps - + 25 fps 25 fps - + 10 fps 10 fps - + 5 fps 5 fps - + Analyzer Falloff Çözümleyici Düşüşü - - + + Slowest En yavaş - - + + Slow Yavaş - - + + Medium Orta - - + + Fast Hızlı - - + + Fastest En hızlı - + Peaks Falloff Tepe Düşüşü - + Background Arkaplan - + Transparent Transparan @@ -847,173 +847,173 @@ MainWindow - + Default Öntanımlı - + 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 - + &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 - + All Supported Bitstreams 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 @@ -1021,194 +1021,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 diff --git a/src/ui/translations/qmmp_uk_UA.ts b/src/ui/translations/qmmp_uk_UA.ts index 4cc242d86..6a8b2f940 100644 --- a/src/ui/translations/qmmp_uk_UA.ts +++ b/src/ui/translations/qmmp_uk_UA.ts @@ -713,132 +713,132 @@ MainVisual - + Visualization Mode Режим візуалізації - + Analyzer Аналізатор - + Scope Осцилограф - + Off Вимкнено - + Analyzer Mode Режим аналізатора - + Normal Звичайний - + Fire Вогонь - + Vertical Lines Вертикальні лінії - + Lines Лінії - + Bars Смужки - + Peaks Піки - + Refresh Rate Частота оновлення - + 50 fps 50 ф/с - + 25 fps 25 ф/с - + 10 fps 10 ф/с - + 5 fps 5 ф/с - + Analyzer Falloff Падіння аналізатора - - + + Slowest Найповільніше - - + + Slow Повільне - - + + Medium Середнє - - + + Fast Швидке - - + + Fastest Найшвидше - + Peaks Falloff Падіння піків - + Background Тло - + Transparent Прозорість @@ -847,173 +847,173 @@ MainWindow - + Default За умовчанням - + Choose a directory Виберіть теку - + Select one or more files to open Виберіть один чи кілька файлів - + &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 &Грати/Пауза - + All Supported Bitstreams Усі формати - + &Repeat Track &Повторити трек - + &Shuffle &Перемішати - + R - + Ctrl+R - + S - + &Repeat Playlist &Повторити список - + Tools Утиліти @@ -1021,194 +1021,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 Дії diff --git a/src/ui/translations/qmmp_zh_CN.ts b/src/ui/translations/qmmp_zh_CN.ts index 9c4cc46d7..cd5b3a11c 100644 --- a/src/ui/translations/qmmp_zh_CN.ts +++ b/src/ui/translations/qmmp_zh_CN.ts @@ -713,132 +713,132 @@ MainVisual - + Visualization Mode 可视化模式 - + Analyzer 分析器 - + Scope 示波器 - + Off 关闭 - + Analyzer Mode 分析模式 - + Normal 标准 - + Fire 火花 - + Vertical Lines 垂直线 - + Lines 线形 - + Bars 条形 - + Peaks 峰值 - + Refresh Rate 刷新率 - + 50 fps 50 fps - + 25 fps 25 fps - + 10 fps 10 fps - + 5 fps 5 fps - + Analyzer Falloff 分析器下降速度 - - + + Slowest 最慢 - - + + Slow 慢 - - + + Medium 中 - - + + Fast 快 - - + + Fastest 最快 - + Peaks Falloff 峰值下降速度 - + Background 背景 - + Transparent 透明 @@ -847,173 +847,173 @@ MainWindow - + Default 默认 - + Choose a directory 选择一个目录 - + Select one or more files to open 选择打开一个或更多文件 - + &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) - + All Supported Bitstreams 支持的全部文件 - + &Repeat Track 重复音轨(&R) - + &Shuffle 乱序(&S) - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist 重复播放列表(&R) - + Tools 工具 @@ -1021,194 +1021,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 动作 diff --git a/src/ui/translations/qmmp_zh_TW.ts b/src/ui/translations/qmmp_zh_TW.ts index 021b1eebc..0918b4a6c 100644 --- a/src/ui/translations/qmmp_zh_TW.ts +++ b/src/ui/translations/qmmp_zh_TW.ts @@ -713,132 +713,132 @@ MainVisual - + Visualization Mode 可視化型態 - + Analyzer 解析器 - + Scope 示波器 - + Off 關閉 - + Analyzer Mode 解析型態 - + Normal 標準 - + Fire 火花 - + Vertical Lines 垂直線 - + Lines 線形 - + Bars 條形 - + Peaks 峰值 - + Refresh Rate 刷新率 - + 50 fps 50 fps - + 25 fps 25 fps - + 10 fps 10 fps - + 5 fps 5 fps - + Analyzer Falloff 解析器下降速度 - - + + Slowest 最慢 - - + + Slow 慢 - - + + Medium 中 - - + + Fast 快 - - + + Fastest 最快 - + Peaks Falloff 峰值下降速度 - + Background 背景 - + Transparent 透明 @@ -847,173 +847,173 @@ MainWindow - + Default 預設 - + Choose a directory 選取一個目錄 - + Select one or more files to open 選取開啟一個或更多檔案 - + &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) - + All Supported Bitstreams 支援的全部檔案 - + &Repeat Track 重復音軌(&R) - + &Shuffle 亂序(&S) - + R R - + Ctrl+R Ctrl+R - + S S - + &Repeat Playlist 重復播放清單(&R) - + Tools 工具 @@ -1021,194 +1021,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 動作 -- cgit v1.2.3-13-gbd6f