Made various fixes and UI improvements to collapser and macro/resumewidgets.

1 files changed, 19 insertions, 5 deletions

diff --git a/client/mainwindow.cc b/client/mainwindow.cc
index 619a24e..2b4780a 100644
--- a/client/mainwindow.cc
+++ b/client/mainwindow.cc
@@ -84,16 +84,26 @@ void MainWindow::update()
         if(xml_elem.attribute("static", "false") == "true") isstatic = true;
         macros[macroname] = new MacroWindow(&netcom, macronode, course, !isstatic);
 
-        QGroupBox *g = new QGroupBox("   " + xml_elem.attribute("caption", macroname));
-        g->setCheckable(false);
-        g->setChecked(false);
+        QGroupBox *g = new QGroupBox();
+        g->setTitle("      " + xml_elem.attribute("caption", macroname));
+        g->setFlat(true);
+        {
+          QFont f = g->font();
+          f.setBold(true);
+          g->setFont(f);
+        }
         ((QBoxLayout*)w->layout())->addWidget(g);
 
         if(!isstatic) {
-          QPushButton *b = new QPushButton("+", g);
+          QPushButton *b = new QPushButton("±", g);
           b->setFixedSize(16,16);
           b->show();
           b->move(0,0);
+          {
+            QFont f = b->font();
+            f.setBold(false);
+            b->setFont(f);
+          }
 
           connect(b, SIGNAL(clicked()), macros[macroname], SLOT(toggleMacro()));
         }
@@ -104,7 +114,11 @@ void MainWindow::update()
         l->addWidget(macros[macroname]);
         connect(macros[macroname], SIGNAL(updateOnCommit()), this, SLOT(update()));
         macros[macroname]->show();
-
+        {
+          QFont f = macros[macroname]->font();
+          f.setBold(false);
+          macros[macroname]->setFont(f);
+        }
       } else {
 
         macros[macroname]->update(macronode);