diff options
| author | Jesse <jesse@debian> | 2015-10-28 12:15:33 -0300 |
|---|---|---|
| committer | Jesse <jesse@debian> | 2015-10-28 12:15:33 -0300 |
| commit | dca01c34bea993efabe7226b9a76e8957408bbdb (patch) | |
| tree | bef3d37fe10220be92931fa408c68f52a32f2586 /lumina-desktop | |
| parent | Fix build issue with Debian packages, this file is no longer included. (diff) | |
| parent | Merge branch 'master' of github.com:pcbsd/lumina (diff) | |
| download | lumina-dca01c34bea993efabe7226b9a76e8957408bbdb.tar.gz lumina-dca01c34bea993efabe7226b9a76e8957408bbdb.tar.bz2 lumina-dca01c34bea993efabe7226b9a76e8957408bbdb.zip | |
Merge branch 'master' of https://github.com/pcbsd/lumina
Diffstat (limited to 'lumina-desktop')
| -rw-r--r-- | lumina-desktop/LSession.cpp | 3 | ||||
| -rw-r--r-- | lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index d0e4c6e0..2190d445 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -372,6 +372,7 @@ void LSession::checkUserFiles(){ // [1.0.0 -> 1000000], [1.2.3 -> 1002003], [0.6.1 -> 6001] QString OVS = sessionsettings->value("DesktopVersion","0").toString(); //Old Version String int oldversion = VersionStringToNumber(OVS); + int nversion = VersionStringToNumber(this->applicationVersion()); bool newversion = ( oldversion < VersionStringToNumber(this->applicationVersion()) ); //increasing version number bool newrelease = ( OVS.contains("-devel", Qt::CaseInsensitive) && this->applicationVersion().contains("-release", Qt::CaseInsensitive) ); //Moving from devel to release @@ -388,7 +389,7 @@ void LSession::checkUserFiles(){ LUtils::upgradeFavorites(oldversion); } //Convert any "userbutton" and "appmenu" panel plugins to the new "systemstart" plugin (0.8.7) - if(oldversion <= 8007 && (newversion || newrelease)){ + if(oldversion <= 8007 && (newversion || newrelease) && nversion < 8008){ QSettings dset(QSettings::UserScope, "LuminaDE","desktopsettings", this); QStringList plugKeys = dset.allKeys().filter("panel").filter("/pluginlist"); for(int i=0; i<plugKeys.length(); i++){ diff --git a/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp b/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp index 926c6fb6..101abd31 100644 --- a/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp +++ b/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp @@ -74,7 +74,7 @@ void AppLauncherPlugin::loadButton(){ //If the file is a symlink, put the overlay on the icon if(QFileInfo(path).isSymLink()){ QImage img = button->icon().pixmap(QSize(icosize,icosize)).toImage(); - int oSize = icosize/2; //overlay size + int oSize = icosize/3; //overlay size QPixmap overlay = LXDG::findIcon("emblem-symbolic-link").pixmap(oSize,oSize).scaled(oSize,oSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); QPainter painter(&img); painter.drawPixmap(icosize-oSize,icosize-oSize,overlay); //put it in the bottom-right corner |