Changeset 182 for smplayer


Ignore:
Timestamp:
Aug 31, 2016, 7:22:54 PM (9 years ago)
Author:
Silvan Scherrer
Message:

smplayer: restore some os/2 removals from vendor, fix branding

Location:
smplayer/trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • smplayer/trunk/build_os2.cmd

    r176 r182  
    2020/*                                       add themes to install,      */
    2121/*                                       changes skin handling)      */
     22/* version 1.0.1 from 31.08.2016 Silvan (add qt4bin path as everything is from rpm */
    2223
    2324/* init the version string (don't forget to change) */
    24 version = "1.0.0"
    25 version_date = "09.10.2014"
     25version = "1.0.1"
     26version_date = "31.08.2016"
    2627'@echo off'
    2728
    … …  
    4849mErrorFile = buildDir||'\make.err'
    4950mOutFile   = buildDir||'\make.out'
     51qt4bin = '%unixroot%\usr\lib\qt4\bin\'
    5052
    5153/* get the SMPlayer version */
    … …  
    109111        say "building svn_revision"
    110112        ok = SysMkDir(buildDir||'\src')
    111         address cmd 'sh ' sourceDir||'\get_svn_revision.sh ' sourceDir ' "eCS(OS/2) build"'
     113        address cmd 'sh ' sourceDir||'\get_svn_revision.sh ' sourceDir ' "OS/2 and OS/2-based Systems build"'
    112114
    113115        say "creating SMPlayer makefile"
    … …  
    165167            fileName = filespec('N',rm.i)
    166168            fileName = left(fileName,lastpos('.', fileName)-1) || '.qm'
    167             cmdtorun = 'lrelease ' || rm.i || ' -qm ' || installDirTranslations || '\' || fileName
     169            cmdtorun = qt4bin || 'lrelease ' || rm.i || ' -qm ' || installDirTranslations || '\' || fileName
    168170            address cmd cmdtorun
    169171        end
    … …  
    313315 *  creates skins and themes in the installation directory
    314316 */
    315 doSkinThemes: procedure expose installDirThemes
     317doSkinThemes: procedure expose installDirThemes qt4bin
    316318
    317319    parse arg inputDir, skinTheme
    … …  
    324326       nameOut = nameOutDir || '\' || name || '.rcc'
    325327       ok = SysMkDir(nameOutDir)
    326        cmdtorun = 'rcc -binary ' || nameIn || ' -o ' || nameOut
     328       cmdtorun = qt4bin || 'rcc -binary ' || nameIn || ' -o ' || nameOut
    327329       address cmd cmdtorun
    328330

  • smplayer/trunk/os2/liesmich.os2

    r176 r182  
    22
    33(W) Christian Hennecke, Oct 28, 2008
    4 zuletzt ge„ndert am 3.05.2016
     4zuletzt ge„ndert am 31.08.2016
    55
    660. INHALT DIESER DATEI
    … …  
    321321=========================
    322322
     3232016-08-31
     324  * updated to SMPlayer version 16.8.0
     325
    3233262016-05-03
    324327  * updated to SMPlayer version 16.4.0

  • smplayer/trunk/os2/lisezmoi.os2

    r176 r182  
    366366==========================
    367367
     3682016-08-31
     369  * Mise
     370 jour
     371 la version 16.8.0 de SMPlayer
     372
    3683732016-05-03
    369374  * Mise

  • smplayer/trunk/os2/readme.os2

    r176 r182  
    22
    33(W) Christian Hennecke, Oct 5, 2009
    4 last update May 3, 2016
     4last update August 31, 2016
    55
    66
    … …  
    303303==========
    304304
     3052016-08-31
     306  * updated to SMPlayer version 16.8.0
     307
    3053082016-05-03
    306309  * updated to SMPlayer version 16.4.0

  • smplayer/trunk/src/basegui.cpp

    r181 r182  
    62516251#endif // Q_OS_WIN
    62526252
     6253#if defined(AVOID_SCREENSAVER) && defined(Q_OS_OS2)
     6254void BaseGui::clear_just_stopped() {
     6255        qDebug("BaseGui::clear_just_stopped");
     6256        just_stopped = false;
     6257}
     6258#endif
     6259
    62536260#include "moc_basegui.cpp"

  • smplayer/trunk/src/basegui.h

    r181 r182  
    2929#include "guiconfig.h"
    3030
    31 #ifdef AVOID_SCREENSAVER
     31#if defined(AVOID_SCREENSAVER) && !defined(Q_OS_OS2)
    3232#include <windows.h>
    3333#endif
    … …  
    327327        virtual void setTabletMode(bool);
    328328
    329 #ifdef Q_OS_WIN
     329#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
     330        #ifdef Q_OS_WIN
    330331        void checkSystemTabletMode();
    331332        void systemTabletModeChanged(bool);
     333        #endif
    332334       
    333335        #ifdef AVOID_SCREENSAVER

  • smplayer/trunk/src/baseguiplus.cpp

    r181 r182  
    222222        if (!pref->tablet_mode) {
    223223                openMenu->addAction(quitAct);
     224#ifndef Q_OS_OS2
    224225                optionsMenu->addAction(showTrayAct);
     226#else
     227                trayAvailable();
     228                connect( optionsMenu, SIGNAL(aboutToShow()),
     229                     this, SLOT(trayAvailable()) );
     230#endif
    225231        }
    226232
    … …  
    693699#endif
    694700
     701#ifdef Q_OS_OS2
     702/*
     703 * we test if xcenter is available at all. if not disable the tray action.
     704 * this is possible when xcenter is not opened or crashed
     705 */
     706void BaseGuiPlus::trayAvailable() {
     707        if (!tray->isSystemTrayAvailable())
     708           optionsMenu->removeAction(showTrayAct);
     709        else
     710           optionsMenu->addAction(showTrayAct);
     711}
     712#endif
    695713
    696714// Convenience functions intended for other GUI's

  • smplayer/trunk/src/baseguiplus.h

    r181 r182  
    9393        virtual void showAll();
    9494        virtual void quit();
     95#ifdef Q_OS_OS2
     96        void trayAvailable();
     97#endif
    9598
    9699#if DOCK_PLAYLIST

  • smplayer/trunk/src/preferences.cpp

    r181 r182  
    8080#endif
    8181
    82 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
     82#if defined(Q_OS_WIN)
    8383        //mplayer_bin= "mplayer/mplayer.exe";
    8484        mplayer_bin= "mpv/mpv.exe";
     85#elif defined(Q_OS_OS2)
     86        mplayer_bin= "mplayer/mplayer.exe";
    8587#else
    8688        //mplayer_bin = "mplayer";
    … …  
    127129        add_blackborders_on_fullscreen = false;
    128130
    129 #ifdef Q_OS_WIN
     131#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    130132        #ifdef SCREENSAVER_OFF
    131133        turn_screensaver_off = false;
    … …  
    655657        set->setValue("add_blackborders_on_fullscreen", add_blackborders_on_fullscreen);
    656658
    657 #ifdef Q_OS_WIN
     659#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    658660        #ifdef SCREENSAVER_OFF
    659661        set->setValue("turn_screensaver_off", turn_screensaver_off);
    … …  
    12071209        add_blackborders_on_fullscreen = set->value("add_blackborders_on_fullscreen", add_blackborders_on_fullscreen).toBool();
    12081210
    1209 #ifdef Q_OS_WIN
     1211#if defined (Q_OS_WIN) || defined(Q_OS_OS2)
    12101212        #ifdef SCREENSAVER_OFF
    12111213        turn_screensaver_off = set->value("turn_screensaver_off", turn_screensaver_off).toBool();
    … …  
    17591761
    17601762#if defined(MPV_SUPPORT) && defined(MPLAYER_SUPPORT)
    1761         #ifdef Q_OS_WIN
     1763        #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    17621764        // Check if the mplayer binary exists and try to fix it
    17631765        if (!QFile::exists(mplayer_bin)) {

  • smplayer/trunk/src/preferences.h

    r181 r182  
    105105        bool add_blackborders_on_fullscreen;
    106106
    107 #ifdef Q_OS_WIN
     107#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    108108        #ifdef SCREENSAVER_OFF
    109109        bool turn_screensaver_off;

  • smplayer/trunk/src/prefgeneral.cpp

    r181 r182  
    7474
    7575        // Screensaver
    76 #ifdef Q_OS_WIN
     76#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    7777        screensaver_check->hide();
    7878        #ifndef SCREENSAVER_OFF
    … …  
    251251        setAutoq( pref->autoq );
    252252
    253 #ifdef Q_OS_WIN
     253#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    254254        #ifdef SCREENSAVER_OFF
    255255        setTurnScreensaverOff( pref->turn_screensaver_off );
    … …  
    347347        TEST_AND_SET(pref->autoq, autoq());
    348348
    349 #ifdef Q_OS_WIN
     349#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    350350        #ifdef SCREENSAVER_OFF
    351351        TEST_AND_SET(pref->turn_screensaver_off, turnScreensaverOff());
    … …  
    835835}
    836836
    837 #ifdef Q_OS_WIN
     837#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    838838#ifdef AVOID_SCREENSAVER
    839839void PrefGeneral::setAvoidScreensaver(bool b) {
    … …  
    10991099           "subtitles automatically in the black borders.") */ );
    11001100
    1101 #ifdef Q_OS_WIN
     1101#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    11021102        #ifdef SCREENSAVER_OFF
    11031103        setWhatsThis(turn_screensaver_off_check, tr("Switch screensaver off"),

  • smplayer/trunk/src/prefgeneral.h

    r181 r182  
    120120        bool startInFullscreen();
    121121
    122 #ifdef Q_OS_WIN
     122#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    123123        #ifdef SCREENSAVER_OFF
    124124        void setTurnScreensaverOff(bool b);

  • smplayer/trunk/src/smplayer.cpp

    r181 r182  
    572572#else
    573573#ifdef Q_OS_OS2
    574            .arg("eCS (OS/2)")
     574           .arg("OS/2 and OS/2-based systems")
    575575#else
    576576                   .arg("Other OS")
Note: See TracChangeset for help on using the changeset viewer.