From 411004eb9a19a84413fe73b757b8ed3a27238d96 Mon Sep 17 00:00:00 2001
From: stefan <stefan@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Fri, 5 Mar 2010 13:28:34 +0000
Subject: [PATCH] Scene_Win: -Labels bold -Organized positions of menupoints

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@1772 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
 modules/gui/src/scene_win/context_menu.cc | 17 +++++++++++------
 modules/gui/src/scene_win/label_node.cc   |  1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/gui/src/scene_win/context_menu.cc b/modules/gui/src/scene_win/context_menu.cc
index 9be56d512..a43816cd1 100644
--- a/modules/gui/src/scene_win/context_menu.cc
+++ b/modules/gui/src/scene_win/context_menu.cc
@@ -114,11 +114,6 @@ void ContextMenu::ShowMenu(const QPoint& pos)
       connect(action, SIGNAL(triggered()), SceneSelection::Instance(), SLOT(Hide()));
     }
 
-    if((all_gfx_objects || all_custom_views) && indexes.size()==2){
-      action = menu->addAction("Rename");
-      connect(action, SIGNAL(triggered()), this, SLOT(Rename()));
-    }
-
     if(all_entity_views){
       action = menu->addAction("Show");
       connect(action, SIGNAL(triggered()), SceneSelection::Instance(), SLOT(MakeVisible()));
@@ -135,13 +130,23 @@ void ContextMenu::ShowMenu(const QPoint& pos)
       action = menu->addAction("Create Custom View");
       connect(action, SIGNAL(triggered()), this, SLOT(AddView()));
 
+    }
+
+    if(all_entity_views){
       if(all_custom_views){
         action = menu->addAction("Delete");
         connect(action, SIGNAL(triggered()), this, SLOT(DeleteView()));
       }
     }
 
-  menu->popup(pos);
+    if((all_gfx_objects || all_custom_views) && indexes.size()==2){
+      action = menu->addAction("Rename");
+      connect(action, SIGNAL(triggered()), this, SLOT(Rename()));
+    }
+
+    if(menu->actions().size()>0){
+      menu->popup(pos);
+    }
   }
 }
 
diff --git a/modules/gui/src/scene_win/label_node.cc b/modules/gui/src/scene_win/label_node.cc
index 7a9c29ce7..5cf9b2d95 100644
--- a/modules/gui/src/scene_win/label_node.cc
+++ b/modules/gui/src/scene_win/label_node.cc
@@ -36,6 +36,7 @@ QVariant LabelNode::GetData(int column, int role){
       return QVariant(name_);
     } else if(role==Qt::FontRole) {
       QFont f("Helvetica");
+      f.setBold(true);
       return QVariant(f);
     }
   }
-- 
GitLab