Changeset 5765dfa


Ignore:
Timestamp:
09/01/14 06:59:11 (4 months ago)
Author:
slicer69 <slicer69@…>
Parents:
1612832 (diff), e894c1f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge e894c1f5ad3e8acca30668cfbedb23924b329e11 into 1612832031f25470ffdee7280d1ede5384a03672

Files:
13 edited

Legend:

Unmodified
Added
Removed
  • lumina/DEPENDENCIES

    rd921b50 re894c1f  
    1717   
    1818  == Linux == 
    19   <To be filled in by a Linux dev> 
     19  (Debian/Ubuntu/Mint packages required) 
     20  qt4-qmake 
     21  libqt4-core 
     22  libqt4-gui 
     23  libqt4-network 
     24  libqt4-svg 
     25  libxcomposite-dev 
    2026 
    2127=== BUILD & RUN === 
  • lumina/libLumina/LuminaOS-FreeBSD.cpp

    rbdc1dbf re894c1f  
    55//  See the LICENSE file for full details 
    66//=========================================== 
     7#ifdef __FreeBSD__ 
    78#include "LuminaOS.h" 
    89#include <unistd.h> 
     
    154155  return LUtils::getCmdOutput("apm -t").join("").toInt(); 
    155156} 
     157 
     158#endif 
  • lumina/libLumina/LuminaOS-Linux.cpp

    rbdc1dbf re894c1f  
    55//  See the LICENSE file for full details 
    66//=========================================== 
     7#ifdef __linux__ 
    78#include "LuminaOS.h" 
    89#include <unistd.h> 
     
    8384  return 0; //not implemented yet for Linux 
    8485} 
     86 
     87#endif 
  • lumina/libLumina/LuminaXDG.cpp

    r14220b49 re894c1f  
    270270      paths << xdd[i]+"/icons";      
    271271    } 
     272    #ifdef __FreeBSD__ 
    272273    paths << "/usr/local/share/pixmaps"; 
     274    #endif 
     275    #ifdef __linux__ 
     276    paths << "/usr/share/pixmaps"; 
     277    #endif 
    273278    QIcon::setThemeSearchPaths(paths); 
    274279  } 
     
    283288  if( ico.isNull() ){ 
    284289    //qDebug() << "Could not find icon:" << iconName; 
     290    #ifdef __FreeBSD__ 
    285291    QDir base("/usr/local/share/pixmaps"); 
     292    #endif 
     293    #ifdef __linux__ 
     294    QDir base("/usr/share/pixmaps"); 
     295    #endif 
    286296    QStringList matches = base.entryList(QStringList() << "*"+iconName+"*", QDir::Files | QDir::NoDotAndDotDot, QDir::Name); 
    287297    if( !matches.isEmpty() ){ 
     298      #ifdef __FreeBSD__ 
    288299      ico = QIcon("/usr/local/share/pixmaps/"+matches[0]); //just use the first match 
     300      #endif 
     301      #ifdef __linux__ 
     302      ico = QIcon("/usr/share/pixmaps/"+matches[0]); //just use the first match 
     303      #endif 
    289304    }else{ 
    290305      //Fallback on a manual search over the default theme directories (hicolor, then oxygen) 
    291306      if( QDir::searchPaths("fallbackicons").isEmpty() ){ 
    292307        //Set the fallback search paths 
     308        #ifdef __FreeBSD__ 
    293309        QString base = "/usr/local/share/icons/"; 
     310        #endif 
     311        #ifdef __linux__ 
     312        QString base = "/usr/share/icons/"; 
     313        #endif 
    294314        QDir::setSearchPaths("fallbackicons", QStringList() << getChildIconDirs(base+"hicolor") << getChildIconDirs(base+"oxygen") );  
    295315      } 
  • lumina/libLumina/libLumina.pro

    reafa892 re894c1f  
    1919        LuminaUtils.cpp \ 
    2020        LuminaX11.cpp \  
    21         LuminaOS-FreeBSD.cpp 
    22 #       LuminaOS-Linux.cpp 
     21        LuminaOS-FreeBSD.cpp \ 
     22        LuminaOS-Linux.cpp 
    2323 
    2424INCLUDEPATH += /usr/local/include 
  • lumina/lumina-config/mainUI.cpp

    r29147c3 re894c1f  
    224224  ui->combo_session_wloc->addItem( tr("Underneath Mouse"), "UnderMousePlacement"); 
    225225  ui->combo_session_wtheme->clear(); 
     226  #ifdef __FreeBSD__ 
    226227  QDir fbdir("/usr/local/share/fluxbox/styles"); 
     228  #endif 
     229  #ifdef __linux__ 
     230  QDir fbdir("/usr/share/fluxbox/styles"); 
     231  #endif 
    227232  QStringList fbstyles = fbdir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); 
    228233  for(int i=0; i<fbstyles.length(); i++){ 
  • lumina/lumina-desktop/SettingsMenu.cpp

    r7183594 re894c1f  
    1919        act->setWhatsThis("lumina-config"); 
    2020        this->addAction(act); 
     21  #ifdef __FreeBSD__ 
    2122  if(QFile::exists("/usr/local/bin/qtconfig-qt4")){ 
     23  #endif 
     24  #ifdef __linux__ 
     25  if(QFile::exists("/usr/bin/qtconfig-qt4")){ 
     26  #endif 
    2227    act = new QAction( LXDG::findIcon("preferences-desktop-theme",""), tr("Window Theme"), this); 
    2328        act->setWhatsThis("qtconfig-qt4"); 
  • lumina/lumina-desktop/lumina-desktop.pro

    rb284fd8 re894c1f  
    103103defaults.path = /usr/local/share/Lumina-DE/ 
    104104 
    105 LIBS     = -L../libLumina -L/usr/local/lib -L/usr/lib -lLuminaUtils -lXdamage 
     105LIBS     = -L../libLumina -L/usr/local/lib -L/usr/lib -lLuminaUtils -lXdamage -lX11 
    106106 
    107107TRANSLATIONS =  i18n/lumina-desktop_af.ts \ 
  • src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_en_GB.ts

    r53521bb rcfd26de  
    9494    <message> 
    9595        <source>Automatic updates check</source> 
    96         <translation type="unfinished"> 
    97             </translation> 
     96        <translation>Automatic updates check</translation> 
    9897    </message> 
    9998    <message> 
    10099        <source>Disable</source> 
    101         <translation type="unfinished"> 
    102             </translation> 
     100        <translation>Disable</translation> 
    103101    </message> 
    104102    <message> 
    105103        <source>Every hour</source> 
    106         <translation type="unfinished"> 
    107             </translation> 
     104        <translation>Every hour</translation> 
    108105    </message> 
    109106    <message> 
    110107        <source>Every 6 hours</source> 
    111         <translation type="unfinished"> 
    112             </translation> 
     108        <translation>Every 6 hours</translation> 
    113109    </message> 
    114110    <message> 
    115111        <source>Every day</source> 
    116         <translation type="unfinished"> 
    117             </translation> 
     112        <translation>Every day</translation> 
    118113    </message> 
    119114</context> 
  • src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_en_ZA.ts

    r53521bb rcfd26de  
    9494    <message> 
    9595        <source>Automatic updates check</source> 
    96         <translation type="unfinished"> 
    97             </translation> 
     96        <translation>Automatic updates check</translation> 
    9897    </message> 
    9998    <message> 
    10099        <source>Disable</source> 
    101         <translation type="unfinished"> 
    102             </translation> 
     100        <translation>Disable</translation> 
    103101    </message> 
    104102    <message> 
    105103        <source>Every hour</source> 
    106         <translation type="unfinished"> 
    107             </translation> 
     104        <translation>Every hour</translation> 
    108105    </message> 
    109106    <message> 
    110107        <source>Every 6 hours</source> 
    111         <translation type="unfinished"> 
    112             </translation> 
     108        <translation>Every 6 hours</translation> 
    113109    </message> 
    114110    <message> 
    115111        <source>Every day</source> 
    116         <translation type="unfinished"> 
    117             </translation> 
     112        <translation>Every day</translation> 
    118113    </message> 
    119114</context> 
  • src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_ru.ts

    r53521bb rcfd26de  
    9595    <message> 
    9696        <source>Automatic updates check</source> 
    97         <translation type="unfinished"> 
    98             </translation> 
     97        <translation>АвтПЌатОческая прПверка ПбМПвлеМОй</translation> 
    9998    </message> 
    10099    <message> 
    101100        <source>Disable</source> 
    102         <translation type="unfinished"> 
    103             </translation> 
     101        <translation>ОтключОть</translation> 
    104102    </message> 
    105103    <message> 
    106104        <source>Every hour</source> 
    107         <translation type="unfinished"> 
    108             </translation> 
     105        <translation>КажЎый час</translation> 
    109106    </message> 
    110107    <message> 
    111108        <source>Every 6 hours</source> 
    112         <translation type="unfinished"> 
    113             </translation> 
     109        <translation>КажЎые 6 часПв</translation> 
    114110    </message> 
    115111    <message> 
    116112        <source>Every day</source> 
    117         <translation type="unfinished"> 
    118             </translation> 
     113        <translation>КажЎый ЎеМь</translation> 
    119114    </message> 
    120115</context> 
  • src-qt4/pc-updategui/i18n/UpdateGui_en_GB.ts

    rae56079 r1612832  
    66    <message> 
    77        <source>System updates patchset</source> 
    8         <translation type="unfinished"> 
    9             </translation> 
     8        <translation>System updates patchset</translation> 
    109    </message> 
    1110    <message> 
    1211        <source>Please select updates patchset</source> 
    13         <translation type="unfinished"> 
    14             </translation> 
     12        <translation>Please select updates patchset</translation> 
    1513    </message> 
    1614    <message> 
    1715        <source>General patchset</source> 
    18         <translation type="unfinished"> 
    19             </translation> 
     16        <translation>General patchset</translation> 
    2017    </message> 
    2118    <message> 
    2219        <source>(General updates patchset. Recommended for most users)</source> 
    23         <translation type="unfinished"> 
    24             </translation> 
     20        <translation>(General updates patchset. Recommended for most users)</translation> 
    2521    </message> 
    2622    <message> 
    2723        <source>Test patchset</source> 
    28         <translation type="unfinished"> 
    29             </translation> 
     24        <translation>Test patchset</translation> 
    3025    </message> 
    3126    <message> 
    3227        <source>(Test updates patchset. May cause unstable system behaviour.  Recommended for testers only.</source> 
    33         <translation type="unfinished"> 
    34             </translation> 
     28        <translation>(Test updates patchset. May cause unstable system behaviour.  Recommended for testers only.</translation> 
    3529    </message> 
    3630    <message> 
    3731        <source>Select patchset</source> 
    38         <translation type="unfinished"> 
    39             </translation> 
     32        <translation>Select patchset</translation> 
    4033    </message> 
    4134    <message> 
    4235        <source>Close</source> 
    43         <translation type="unfinished"> 
    44             </translation> 
     36        <translation>Close</translation> 
    4537    </message> 
    4638    <message> 
    4739        <source>File %1 was not found</source> 
    48         <translation type="unfinished"> 
    49             </translation> 
     40        <translation>File %1 was not found</translation> 
    5041    </message> 
    5142</context> 
     
    5445    <message> 
    5546        <source>Base system updates history</source> 
    56         <translation type="unfinished"> 
    57             </translation> 
     47        <translation>Base system updates history</translation> 
    5848    </message> 
    5949    <message> 
    6050        <source>Release</source> 
    61         <translation type="unfinished"> 
    62             </translation> 
     51        <translation>Release</translation> 
    6352    </message> 
    6453    <message> 
    6554        <source>Your system should have at least one system update!</source> 
    66         <translation type="unfinished"> 
    67             </translation> 
     55        <translation>Your system should have at least one system update!</translation> 
    6856    </message> 
    6957    <message> 
    7058        <source>#</source> 
    71         <translation type="unfinished"> 
    72             </translation> 
     59        <translation>#</translation> 
    7360    </message> 
    7461    <message> 
    7562        <source>Description</source> 
    76         <translation type="unfinished"> 
    77             </translation> 
     63        <translation>Description</translation> 
    7864    </message> 
    7965    <message> 
    8066        <source>Close</source> 
    81         <translation type="unfinished"> 
    82             </translation> 
     67        <translation>Close</translation> 
    8368    </message> 
    8469    <message> 
    8570        <source> (Current)</source> 
    86         <translation type="unfinished"> 
    87             </translation> 
     71        <translation> (Current)</translation> 
    8872    </message> 
    8973</context> 
     
    260244    <message> 
    261245        <source>File</source> 
    262         <translation type="unfinished"> 
    263             </translation> 
     246        <translation>File</translation> 
    264247    </message> 
    265248    <message> 
    266249        <source>Configure</source> 
    267         <translation type="unfinished"> 
    268             </translation> 
     250        <translation>Configure</translation> 
    269251    </message> 
    270252    <message> 
    271253        <source>View</source> 
    272         <translation type="unfinished"> 
    273             </translation> 
     254        <translation>View</translation> 
    274255    </message> 
    275256    <message> 
    276257        <source>Exit</source> 
    277         <translation type="unfinished"> 
    278             </translation> 
     258        <translation>Exit</translation> 
    279259    </message> 
    280260    <message> 
    281261        <source>Patchset</source> 
    282         <translation type="unfinished"> 
    283             </translation> 
     262        <translation>Patchset</translation> 
    284263    </message> 
    285264    <message> 
    286265        <source>Update descriptions</source> 
    287         <translation type="unfinished"> 
    288             </translation> 
     266        <translation>Update descriptions</translation> 
    289267    </message> 
    290268</context> 
  • src-qt4/pc-updategui/i18n/UpdateGui_en_ZA.ts

    rae56079 r1612832  
    66    <message> 
    77        <source>System updates patchset</source> 
    8         <translation type="unfinished"> 
    9             </translation> 
     8        <translation>System updates patchset</translation> 
    109    </message> 
    1110    <message> 
    1211        <source>Please select updates patchset</source> 
    13         <translation type="unfinished"> 
    14             </translation> 
     12        <translation>Please select updates patchset</translation> 
    1513    </message> 
    1614    <message> 
    1715        <source>General patchset</source> 
    18         <translation type="unfinished"> 
    19             </translation> 
     16        <translation>General patchset</translation> 
    2017    </message> 
    2118    <message> 
    2219        <source>(General updates patchset. Recommended for most users)</source> 
    23         <translation type="unfinished"> 
    24             </translation> 
     20        <translation>(General updates patchset. Recommended for most users)</translation> 
    2521    </message> 
    2622    <message> 
    2723        <source>Test patchset</source> 
    28         <translation type="unfinished"> 
    29             </translation> 
     24        <translation>Test patchset</translation> 
    3025    </message> 
    3126    <message> 
    3227        <source>(Test updates patchset. May cause unstable system behaviour.  Recommended for testers only.</source> 
    33         <translation type="unfinished"> 
    34             </translation> 
     28        <translation>(Test updates patchset. May cause unstable system behaviour.  Recommended for testers only.</translation> 
    3529    </message> 
    3630    <message> 
    3731        <source>Select patchset</source> 
    38         <translation type="unfinished"> 
    39             </translation> 
     32        <translation>Select patchset</translation> 
    4033    </message> 
    4134    <message> 
    4235        <source>Close</source> 
    43         <translation type="unfinished"> 
    44             </translation> 
     36        <translation>Close</translation> 
    4537    </message> 
    4638    <message> 
    4739        <source>File %1 was not found</source> 
    48         <translation type="unfinished"> 
    49             </translation> 
     40        <translation>File %1 was not found</translation> 
    5041    </message> 
    5142</context> 
     
    5445    <message> 
    5546        <source>Base system updates history</source> 
    56         <translation type="unfinished"> 
    57             </translation> 
     47        <translation>Base system updates history</translation> 
    5848    </message> 
    5949    <message> 
    6050        <source>Release</source> 
    61         <translation type="unfinished"> 
    62             </translation> 
     51        <translation>Release</translation> 
    6352    </message> 
    6453    <message> 
    6554        <source>Your system should have at least one system update!</source> 
    66         <translation type="unfinished"> 
    67             </translation> 
     55        <translation>Your system should have at least one system update!</translation> 
    6856    </message> 
    6957    <message> 
    7058        <source>#</source> 
    71         <translation type="unfinished"> 
    72             </translation> 
     59        <translation>#</translation> 
    7360    </message> 
    7461    <message> 
    7562        <source>Description</source> 
    76         <translation type="unfinished"> 
    77             </translation> 
     63        <translation>Description</translation> 
    7864    </message> 
    7965    <message> 
    8066        <source>Close</source> 
    81         <translation type="unfinished"> 
    82             </translation> 
     67        <translation>Close</translation> 
    8368    </message> 
    8469    <message> 
    8570        <source> (Current)</source> 
    86         <translation type="unfinished"> 
    87             </translation> 
     71        <translation> (Current)</translation> 
    8872    </message> 
    8973</context> 
     
    260244    <message> 
    261245        <source>File</source> 
    262         <translation type="unfinished"> 
    263             </translation> 
     246        <translation>File</translation> 
    264247    </message> 
    265248    <message> 
    266249        <source>Configure</source> 
    267         <translation type="unfinished"> 
    268             </translation> 
     250        <translation>Configure</translation> 
    269251    </message> 
    270252    <message> 
    271253        <source>View</source> 
    272         <translation type="unfinished"> 
    273             </translation> 
     254        <translation>View</translation> 
    274255    </message> 
    275256    <message> 
    276257        <source>Exit</source> 
    277         <translation type="unfinished"> 
    278             </translation> 
     258        <translation>Exit</translation> 
    279259    </message> 
    280260    <message> 
    281261        <source>Patchset</source> 
    282         <translation type="unfinished"> 
    283             </translation> 
     262        <translation>Patchset</translation> 
    284263    </message> 
    285264    <message> 
    286265        <source>Update descriptions</source> 
    287         <translation type="unfinished"> 
    288             </translation> 
     266        <translation>Update descriptions</translation> 
    289267    </message> 
    290268</context> 
Note: See TracChangeset for help on using the changeset viewer.