Changeset 215805a


Ignore:
Timestamp:
Jun 10, 2014 3:29:45 AM (5 weeks ago)
Author:
yurkis <yurkis@…>
Branches:
master, releng/10.0.2
Children:
790f0b5
Parents:
7c393d6 (diff), 3d56fa7 (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 branch 'master' of https://github.com/pcbsd/pcbsd

Files:
9 edited

Legend:

Unmodified
Added
Removed
  • pbi-modules/x11/gsynaptics/xdg-desktop/gsynaptics.desktop

    rd0cec4f r3d56fa7  
    99StartupNotify=true 
    1010Name=gsynaptics 
     11Name[fr]=gsynaptics 
    1112Name[ja]=gsynaptics 
    1213GenericName=gsynaptics 
     14GenericName[fr]=gsynaptics 
    1315GenericName[ja]=gsynaptics 
  • pbi-modules/x11/gsynaptics/xdg-menu/gsynaptics-init.desktop

    rd0cec4f r3d56fa7  
    99StartupNotify=true 
    1010Name=gsynaptics-init 
     11Name[fr]=gsynaptics-init 
    1112Name[ja]=gsynaptics-init 
    1213GenericName=gsynaptics-init 
     14GenericName[fr]=gsynaptics-init 
    1315GenericName[ja]=gsynaptics-init 
  • pbi-modules/x11/gsynaptics/xdg-menu/gsynaptics.desktop

    rd0cec4f r3d56fa7  
    99StartupNotify=true 
    1010Name=gsynaptics 
     11Name[fr]=gsynaptics 
    1112Name[ja]=gsynaptics 
    1213GenericName=gsynaptics 
     14GenericName[fr]=gsynaptics 
    1315GenericName[ja]=gsynaptics 
  • pbi-modules/x11/guake/xdg-desktop/guake-prefs.desktop

    rd0cec4f r3d56fa7  
    99StartupNotify=true 
    1010Name=guake-prefs 
     11Name[fr]=guake-prefs 
    1112Name[ja]=guake-prefs 
    1213GenericName=guake-prefs 
     14GenericName[fr]=guake-prefs 
    1315GenericName[ja]=guake-prefs 
  • pbi-modules/x11/guake/xdg-desktop/guake.desktop

    rd0cec4f r3d56fa7  
    99StartupNotify=true 
    1010Name=guake 
     11Name[fr]=guake 
    1112Name[ja]=guake 
    1213GenericName=guake 
     14GenericName[fr]=guake 
    1315GenericName[ja]=guake 
  • src-qt4/pc-controlpanel/backend/cp-itemgroup.cpp

    r5a541db r7c393d6  
     1/************************************************************************** 
     2*   Copyright (C) 2014 by Yuri Momotyuk                                   * 
     3*   yurkis@pcbsd.org                                                      * 
     4*                                                                         * 
     5*   Permission is hereby granted, free of charge, to any person obtaining * 
     6*   a copy of this software and associated documentation files (the       * 
     7*   "Software"), to deal in the Software without restriction, including   * 
     8*   without limitation the rights to use, copy, modify, merge, publish,   * 
     9*   distribute, sublicense, and/or sell copies of the Software, and to    * 
     10*   permit persons to whom the Software is furnished to do so, subject to * 
     11*   the following conditions:                                             * 
     12*                                                                         * 
     13*   The above copyright notice and this permission notice shall be        * 
     14*   included in all copies or substantial portions of the Software.       * 
     15*                                                                         * 
     16*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       * 
     17*   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    * 
     18*   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.* 
     19*   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR     * 
     20*   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * 
     21*   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * 
     22*   OTHER DEALINGS IN THE SOFTWARE.                                       * 
     23***************************************************************************/ 
     24 
    125#include "cp-itemgroup.h" 
    226#include "misc.h" 
  • src-qt4/pc-controlpanel/mainwindow.cpp

    r7f07436b r7c393d6  
     1/************************************************************************** 
     2*   Copyright (C) 2014 by Yuri Momotyuk                                   * 
     3*   yurkis@pcbsd.org                                                      * 
     4*                                                                         * 
     5*   Permission is hereby granted, free of charge, to any person obtaining * 
     6*   a copy of this software and associated documentation files (the       * 
     7*   "Software"), to deal in the Software without restriction, including   * 
     8*   without limitation the rights to use, copy, modify, merge, publish,   * 
     9*   distribute, sublicense, and/or sell copies of the Software, and to    * 
     10*   permit persons to whom the Software is furnished to do so, subject to * 
     11*   the following conditions:                                             * 
     12*                                                                         * 
     13*   The above copyright notice and this permission notice shall be        * 
     14*   included in all copies or substantial portions of the Software.       * 
     15*                                                                         * 
     16*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       * 
     17*   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    * 
     18*   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.* 
     19*   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR     * 
     20*   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * 
     21*   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * 
     22*   OTHER DEALINGS IN THE SOFTWARE.                                       * 
     23***************************************************************************/ 
    124 
    225#include <QAction> 
     
    427#include <QToolTip> 
    528#include <QDir> 
     29#include <QPainter> 
    630 
    731#include <unistd.h> 
     
    178202                        mEnabledDEs<<installedDEs[k].Name; 
    179203                        ui->DEChooserButton->setIcon(QIcon(DEEntries[i].mIconPath)); 
    180                         ui->DELaunchConfigApp->setIcon(QIcon(DEEntries[i].mIconPath)); 
     204                        setDEConfigAllIcon(QIcon(DEEntries[i].mIconPath)); 
    181205                        if (installedDEs[k].ConfigurationApplication.length()) 
    182206                        { 
     
    517541 
    518542/////////////////////////////////////////////////////////////////////////////// 
     543void MainWindow::setDEConfigAllIcon(QIcon de_icon) 
     544{ 
     545    QIcon btn_icon = de_icon; 
     546    if (!btn_icon.availableSizes().size()) 
     547        return; 
     548    QSize orig_size = btn_icon.availableSizes()[0]; //It should be loaded in read() and should have one size; 
     549    int orig_h = orig_size.height(); 
     550    int orig_w = orig_size.width(); 
     551 
     552    QPixmap orig_pixmap =btn_icon.pixmap(orig_size); 
     553    QPainter painter(&orig_pixmap); 
     554    QPixmap mark; 
     555    mark.load(":/images/config.png"); 
     556    //QRect draw_rect=QRect(orig_w - orig_w/2, orig_h - orig_h/2, orig_w/2, orig_h/2); 
     557    //QRect draw_rect=QRect(0, 0, orig_w, orig_h); 
     558    QRect draw_rect=QRect(orig_w - orig_w*0.7, orig_h - orig_h*0.7, orig_w*0.7, orig_h*0.7); 
     559    painter.drawPixmap(draw_rect, mark); 
     560 
     561    ui->DELaunchConfigApp->setIcon(QIcon(orig_pixmap)); 
     562} 
     563 
     564/////////////////////////////////////////////////////////////////////////////// 
    519565void MainWindow::onStartupFinished() 
    520566{ 
     
    570616            if (DEEntries[i].mDEInfo.ConfigurationApplication.length()) 
    571617            { 
    572                 ui->DELaunchConfigApp->setIcon(source->icon()); 
     618                setDEConfigAllIcon(source->icon()); 
    573619                ui->DELaunchConfigApp->setVisible(true); 
    574620            } 
  • src-qt4/pc-controlpanel/mainwindow.h

    r7f07436b r7c393d6  
     1/************************************************************************** 
     2*   Copyright (C) 2014 by Yuri Momotyuk                                   * 
     3*   yurkis@pcbsd.org                                                      * 
     4*                                                                         * 
     5*   Permission is hereby granted, free of charge, to any person obtaining * 
     6*   a copy of this software and associated documentation files (the       * 
     7*   "Software"), to deal in the Software without restriction, including   * 
     8*   without limitation the rights to use, copy, modify, merge, publish,   * 
     9*   distribute, sublicense, and/or sell copies of the Software, and to    * 
     10*   permit persons to whom the Software is furnished to do so, subject to * 
     11*   the following conditions:                                             * 
     12*                                                                         * 
     13*   The above copyright notice and this permission notice shall be        * 
     14*   included in all copies or substantial portions of the Software.       * 
     15*                                                                         * 
     16*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       * 
     17*   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    * 
     18*   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.* 
     19*   IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR     * 
     20*   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * 
     21*   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * 
     22*   OTHER DEALINGS IN THE SOFTWARE.                                       * 
     23***************************************************************************/ 
     24 
    125#ifndef MAINWINDOW_H 
    226#define MAINWINDOW_H 
     
    6791    void setListMode(bool isListMode); 
    6892    void setFixedItemsLayout(bool isFixedLayout); 
     93    void setDEConfigAllIcon(QIcon de_icon); 
    6994 
    7095    void onStartupFinished(); 
  • src-qt4/pc-updatecenter/pkgcontroller.cpp

    r4c2de6c r7c393d6  
    431431    progress.mItemNo = mCurrentPkgNo; 
    432432    progress.mItemsCount = mUpdData.mCommonPkgsCount; 
    433     QString No = (mCurrentPkgNo<=mUpdData.mCommonPkgsCount)?QString(tr("[%1 of %2] ").arg(mCurrentPkgNo).arg(progress.mItemsCount)): 
    434                                                            QString("[%1] ").arg(mCurrentPkgNo); 
     433    QString No = (mCurrentPkgNo<=(int)mUpdData.mCommonPkgsCount)?QString(tr("[%1 of %2] ").arg(mCurrentPkgNo).arg(progress.mItemsCount)): 
     434                                                                 QString("[%1] ").arg(mCurrentPkgNo); 
    435435 
    436436    size= size.left(size.indexOf(" ")); 
Note: See TracChangeset for help on using the changeset viewer.