Merge branch 'master' of http://github.com/trueos/lumina

4 files changed, 20 insertions, 15 deletions

diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/ItemWidget.cpp b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/ItemWidget.cpp
index f4382ffc..545000f4 100644
--- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/ItemWidget.cpp
+++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/ItemWidget.cpp
@@ -70,12 +70,12 @@ ItemWidget::ItemWidget(QWidget *parent, QString itemPath, QString type, bool gob
       iconPath = itemPath;
       //icon->setPixmap( QIcon(itemPath).pixmap(64,64) );
     }else{
-      if( LUtils::isValidBinary(itemPath) ){  
+      if( LUtils::isValidBinary(itemPath) ){
         if(ICONS->exists(type)){ iconPath = type; }
         else{ iconPath = "application-x-executable"; }
       }else{ iconPath = LXDG::findAppMimeForFile(itemPath.section("/",-1)).replace("/","-"); }
     }
-    name->setText( itemPath.section("/",-1) ); //this->fontMetrics().elidedText(itemPath.section("/",-1), Qt::ElideRight, TEXTCUTOFF) ); 
+    name->setText( itemPath.section("/",-1) ); //this->fontMetrics().elidedText(itemPath.section("/",-1), Qt::ElideRight, TEXTCUTOFF) );
     text = itemPath.section("/",-1) ;
   }
   ICONS->loadIcon(icon, iconPath);
@@ -133,11 +133,11 @@ ItemWidget::~ItemWidget(){
   //actButton->deleteLater();
   contextMenu->clear();
   //contextMenu->deleteLater();
-  if(actButton->menu()!=0){ 
+  if(actButton->menu()!=0){
     for(int i=0; i<actButton->menu()->actions().length(); i++){
       actButton->menu()->actions().at(i)->deleteLater();
     }
-    actButton->menu()->deleteLater(); 
+    actButton->menu()->deleteLater();
   }
   //actButton->deleteLater();
   //icon->deleteLater();
@@ -156,7 +156,7 @@ void ItemWidget::createWidget(){
   menuopen = false;
   menureset = new QTimer(this);
     menureset->setSingleShot(true);
-    menureset->setInterval(1000); //1 second	
+    menureset->setInterval(1000); //1 second
   this->setContentsMargins(0,0,0,0);
   contextMenu = new QMenu(this);
     connect(contextMenu, SIGNAL(aboutToShow()), this, SLOT(actionMenuOpen()) );
@@ -220,7 +220,7 @@ void ItemWidget::setupActions(XDGDesktop *app){
       else{ ICONS->loadIcon(act, app->icon); }
       act->setToolTip(app->actions[i].ID);
       act->setWhatsThis(app->actions[i].ID);
-      actButton->menu()->addAction(act);	
+      actButton->menu()->addAction(act);
   }
   connect(actButton->menu(), SIGNAL(triggered(QAction*)), this, SLOT(actionClicked(QAction*)) );
   connect(actButton->menu(), SIGNAL(aboutToShow()), this, SLOT(actionMenuOpen()) );
@@ -230,9 +230,11 @@ void ItemWidget::setupActions(XDGDesktop *app){
 
 void ItemWidget::updateItems(){
   //update the text/icon to match sizes
-  int H = (2.5*name->fontMetrics().height() ) -4; //make sure the height is large enough for two lines
+  int H = (2.2*name->fontMetrics().height() ) -4; //make sure the height is large enough for two lines
   icon->setFixedSize(QSize(H, H));
+  icon->setAlignment(Qt::AlignCenter);
   actButton->setFixedSize( QSize( H/2, H) );
+  H = (1.8*name->fontMetrics().height() ) -4;
   QStringList newname = text.split("<br>");
   for(int i=0; i<newname.length(); i++){ newname[i] = name->fontMetrics().elidedText(newname[i], Qt::ElideRight, name->width()); }
   name->setText( newname.join("<br>") );
@@ -271,9 +273,9 @@ void ItemWidget::RemoveFavorite(){
 void ItemWidget::AddFavorite(){
   if( LDesktopUtils::addFavorite(icon->whatsThis()) ){
     linkPath = icon->whatsThis();
-    emit NewShortcut();	
+    emit NewShortcut();
   }
-  
+
 }
 void ItemWidget::RemoveQL(){
   qDebug() << "Remove QuickLaunch Button:" << icon->whatsThis();
@@ -282,7 +284,7 @@ void ItemWidget::RemoveQL(){
 
 void ItemWidget::AddQL(){
   qDebug() << "Add QuickLaunch Button:" << icon->whatsThis();
-  emit toggleQuickLaunch(icon->whatsThis(), true);	
+  emit toggleQuickLaunch(icon->whatsThis(), true);
 }
 
 
diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp
index 562122ae..d8014f4c 100644
--- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp
+++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp
@@ -25,9 +25,11 @@ LStartButtonPlugin::LStartButtonPlugin(QWidget *parent, QString id, bool horizon
   startmenu = new StartMenu(this);
     connect(startmenu, SIGNAL(CloseMenu()), this, SLOT(closeMenu()) );
     connect(startmenu, SIGNAL(UpdateQuickLaunch(QStringList)), this, SLOT(updateQuickLaunch(QStringList)));
-  //QRect screenSize = QApplication::desktop()->availableGeometry(this);
-  QSize saved = LSession::handle()->DesktopPluginSettings()->value("panelPlugs/"+this->type()+"/MenuSize", QSize(0, 0)).toSize();
-  if(!saved.isNull()){ startmenu->setFixedSize(saved); } //re-load the previously saved value
+
+  QRect screenSize = QApplication::desktop()->availableGeometry(this);
+  QSize saved = LSession::handle()->DesktopPluginSettings()->value("panelPlugs/"+this->type()+"/MenuSize",QSize(this->fontMetrics().width("x")*30 ,screenSize.height()/1.8)).toSize();
+  //qDebug() << "Got Start Menu Saved Size:" << saved;
+  if(!saved.isNull() && saved.isValid()){ startmenu->setFixedSize(saved); } //re-load the previously saved value
   menu->setContents(startmenu);
 
   button->setMenu(menu);
@@ -122,6 +124,7 @@ void LStartButtonPlugin::openMenu(){
     menu->setContents(startmenu);
   if(old!=0){ old->deleteLater(); }*/
 //--------
+  //qDebug() << "Menu Size:" << startmenu->size();
   startmenu->UpdateMenu();
   button->showMenu();
 }
diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp
index 272bf0fa..ee3e0f80 100644
--- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp
+++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp
@@ -597,7 +597,7 @@ void StartMenu::on_tool_restart_clicked(){
   LSession::handle()->StartReboot(true);
 }
 
-void StartMenu::on_tool_restart_update_clicked(){
+void StartMenu::on_tool_restart_updates_clicked(){
   emit CloseMenu();
   QCoreApplication::processEvents();
   //bool skipupdates =  false;
diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.h b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.h
index 41bc3ec4..0a90311d 100644
--- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.h
+++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.h
@@ -73,7 +73,7 @@ private slots:
 	void on_tool_lock_clicked();
 	void on_tool_logout_clicked();
 	void on_tool_restart_clicked();
-	void on_tool_restart_update_clicked();
+	void on_tool_restart_updates_clicked();
 	void on_tool_shutdown_clicked();
 	void on_tool_suspend_clicked();