Ignore:
Timestamp:
May 3, 2016, 5:25:45 PM (9 years ago)
Author:
Silvan Scherrer
Message:

smplayer: update trunk to version 16.4

Location:
smplayer/trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • smplayer/trunk

  • smplayer/trunk/src/skingui/actiontools.cpp

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33
    44    This program is free software; you can redistribute it and/or modify

  • smplayer/trunk/src/skingui/actiontools.h

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33
    44    This program is free software; you can redistribute it and/or modify

  • smplayer/trunk/src/skingui/mediabarpanel.cpp

    r170 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44
    … …  
    172172}
    173173
     174void MediaBarPanel::setScrollingEnabled(bool b) {
     175        qDebug("MediaBarPanel::setScrollingEnabled: %d", b);
     176        mediaPanel->setScrollingEnabled(b);
     177}
     178
    174179#include "moc_mediabarpanel.cpp"
    175180

  • smplayer/trunk/src/skingui/mediabarpanel.h

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44
    … …  
    7272        void setSeeker(int v);
    7373        void setResolutionVisible(bool b);
     74        void setScrollingEnabled(bool b);
    7475
    7576signals:

  • smplayer/trunk/src/skingui/mediapanel.cpp

    r170 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44
    … …  
    130130}
    131131
     132void MediaPanel::setScrollingEnabled(bool b) {
     133        mediaLabel->setScrollingEnabled(b);
     134}
     135
    132136void MediaPanel::paintEvent(QPaintEvent * e) {
    133137        QPainter p(this);
    … …  
    282286        }
    283287
    284         if (rect.width() > width()) {
    285                 timerId = startTimer(20);
     288        if (scrolling_enabled) {
     289                if (rect.width() > width()) {
     290                        timerId = startTimer(20);
     291                }
    286292        }
    287293}
    … …  
    293299}
    294300
    295 
    296301ScrollingLabel::ScrollingLabel(QWidget* parent ) {
    297302        scrollPos =0;
    298303        timerId = -1;
     304        scrolling_enabled = false;
    299305        textRect = QRect();
    300306        setAttribute(Qt::WA_StyledBackground, true);
    … …  
    302308}
    303309
     310void ScrollingLabel::setScrollingEnabled(bool b) {
     311        scrolling_enabled = b;
     312        updateLabel();
     313        repaint();
     314}
     315
    304316void ScrollingLabel::resizeEvent(QResizeEvent *) {
    305317        updateLabel();

  • smplayer/trunk/src/skingui/mediapanel.h

    r170 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44
    … …  
    4141    void setText( QString text);
    4242
     43    void setScrollingEnabled(bool b);
     44    bool scrollingEnabled() { return scrolling_enabled; };
     45
    4346private:
    4447    QString mText;
    … …  
    4750    int timerId;
    4851    QRect textRect;
    49     static const int gap = 10;       
     52    static const int gap = 10;
     53    bool scrolling_enabled;
    5054
    5155protected:
    … …  
    9599        void setSeeker(int v);
    96100        void setResolutionVisible(bool b);
     101        void setScrollingEnabled(bool b);
    97102
    98103private:

  • smplayer/trunk/src/skingui/mybutton.cpp

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/mybutton.h

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/myicon.cpp

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/myicon.h

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/panelseeker.cpp

    r170 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/panelseeker.h

    r170 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/playcontrol.cpp

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/playcontrol.h

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/qpropertysetter.cpp

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/qpropertysetter.h

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/skingui.cpp

    r170 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33
    44    This program is free software; you can redistribute it and/or modify
    … …  
    8888        statusBar()->hide();
    8989
    90         changeStyleSheet(pref->iconset);
     90        applyStyles();
    9191        mediaBarPanel->setVolume(50);
    9292}
    … …  
    9494SkinGui::~SkinGui() {
    9595        saveConfig();
    96 }
    97 
    98 void SkinGui::changeStyleSheet(QString style) {
    99         if (style.isEmpty())  {
    100                 qApp->setStyleSheet("");
    101         }
    102         else {
    103                 QString qss = Images::styleSheet();
    104 #ifdef USE_RESOURCES
    105                 Images::setTheme(pref->iconset);
    106                 QString path = ":/" + pref->iconset;
    107 #else
    108                 QDir current = QDir::current();
    109                 QString td = Images::themesDirectory();
    110                 QString path = current.relativeFilePath(td);
    111 #endif
    112                 qss.replace(QRegExp("url\\s*\\(\\s*([^\\);]+)\\s*\\)", Qt::CaseSensitive, QRegExp::RegExp2),
    113                                                         QString("url(%1\\1)").arg(path + "/"));
    114                 //qDebug("SkinGui::changeStyleSheet: qss: %s", qss.toLatin1().constData());
    115                 qApp->setStyleSheet(qss);
    116         }
    11796}
    11897
    … …  
    153132        viewVideoInfoAct = new MyAction(this, "toggle_video_info_skingui" );
    154133        viewVideoInfoAct->setCheckable(true);
     134
     135        scrollTitleAct = new MyAction(this, "toggle_scroll_title_skingui" );
     136        scrollTitleAct->setCheckable(true);
    155137}
    156138
    … …  
    171153        volumeslider_action->disable();
    172154}
     155#endif // AUTODISABLE_ACTIONS
    173156
    174157void SkinGui::togglePlayAction(Core::State state) {
    … …  
    183166        }
    184167}
    185 #endif // AUTODISABLE_ACTIONS
    186168
    187169void SkinGui::createMenus() {
    … …  
    206188        statusbar_menu = new QMenu(this);
    207189        statusbar_menu->addAction(viewVideoInfoAct);
     190        statusbar_menu->addAction(scrollTitleAct);
    208191        optionsMenu->addMenu(statusbar_menu);
    209192}
    … …  
    226209        toolbar1->setObjectName("toolbar");
    227210        toolbar1->setMovable(false);
    228         toolbar1->setFixedHeight(35);
     211        //toolbar1->setFixedHeight(35);
    229212        addToolBar(Qt::TopToolBarArea, toolbar1);
    230213#if USE_CONFIGURABLE_TOOLBARS
    … …  
    317300             mediaBarPanel, SLOT(setResolutionVisible(bool)) );
    318301
     302        connect( scrollTitleAct, SIGNAL(toggled(bool)),
     303             mediaBarPanel, SLOT(setScrollingEnabled(bool)) );
     304
    319305        mediaBarPanelAction = controlwidget->addWidget(mediaBarPanel);
    320306}
    … …  
    420406
    421407        viewVideoInfoAct->change(Images::icon("view_video_info"), tr("&Video info") );
     408        scrollTitleAct->change(Images::icon("scroll_title"), tr("&Scroll title") );
    422409}
    423410
    … …  
    430417
    431418        switch (state) {
    432                 case Core::Playing:             mediaBarPanel->displayMessage( tr("Playing %1").arg(core->mdat.filename)); break;
     419                //case Core::Playing:           mediaBarPanel->displayMessage( tr("Playing %1").arg(core->mdat.filename)); break;
     420                case Core::Playing:             mediaBarPanel->displayMessage( tr("Playing") ); break;
    433421                case Core::Paused:              mediaBarPanel->displayMessage( tr("Pause") ); break;
    434422                case Core::Stopped:             mediaBarPanel->displayMessage( tr("Stop") ); break;
     423                case Core::Buffering:   /* mediaBarPanel->displayMessage( tr("Buffering...") ); */ break;
    435424        }
    436425}
    … …  
    480469        floating_control->setActivationArea( (AutohideWidget::Activation) pref->floating_activation_area);
    481470        floating_control->setHideDelay(pref->floating_hide_delay);
    482         QTimer::singleShot(500, floating_control, SLOT(activate()));
     471        QTimer::singleShot(100, floating_control, SLOT(activate()));
    483472
    484473
    … …  
    540529
    541530        set->setValue("video_info", viewVideoInfoAct->isChecked());
     531        set->setValue("scroll_title", scrollTitleAct->isChecked());
    542532
    543533        set->setValue("fullscreen_toolbar1_was_visible", fullscreen_toolbar1_was_visible);
    … …  
    562552        set->setValue("toolbar1_version", TOOLBAR_VERSION);
    563553        set->endGroup();
     554
     555        set->beginGroup("toolbars_icon_size");
     556        set->setValue("toolbar1", toolbar1->iconSize());
     557        #if defined(SKIN_EDITABLE_CONTROL)
     558        set->setValue("floating_control", iw->iconSize());
     559        #endif
     560        set->endGroup();
    564561#endif
    565562
    … …  
    575572
    576573        viewVideoInfoAct->setChecked(set->value("video_info", false).toBool());
     574        scrollTitleAct->setChecked(set->value("scroll_title", false).toBool());
    577575
    578576        fullscreen_toolbar1_was_visible = set->value("fullscreen_toolbar1_was_visible", fullscreen_toolbar1_was_visible).toBool();
    … …  
    613611        #endif
    614612        set->endGroup();
     613
     614        set->beginGroup("toolbars_icon_size");
     615        toolbar1->setIconSize(set->value("toolbar1", toolbar1->iconSize()).toSize());
     616        #if defined(SKIN_EDITABLE_CONTROL)
     617        iw->setIconSize(set->value("floating_control", iw->iconSize()).toSize());
     618        #endif
     619        set->endGroup();
    615620#endif
    616621

  • smplayer/trunk/src/skingui/skingui.h

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33
    44    This program is free software; you can redistribute it and/or modify
    … …  
    1717*/
    1818
    19 #ifndef _SKINGUI_H_
    20 #define _SKINGUI_H_
     19#ifndef SKINGUI_H
     20#define SKINGUI_H
    2121
    2222#include "guiconfig.h"
    … …  
    8383        virtual void enableActionsOnPlaying();
    8484        virtual void disableActionsOnStop();
     85#endif
    8586        virtual void togglePlayAction(Core::State);
    86 #endif
    87         virtual void changeStyleSheet(QString style);
    8887
    8988protected:
    … …  
    113112
    114113        MyAction * viewVideoInfoAct;
     114        MyAction * scrollTitleAct;
    115115
    116116        QMenu * toolbar_menu;

  • smplayer/trunk/src/skingui/volumecontrolpanel.cpp

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44
Note: See TracChangeset for help on using the changeset viewer.