A round of app beautification.

author: Brian Helfrich <helfrich9000@gmail.com> 2008-03-15 03:34:06 +0000
committer: Brian Helfrich <helfrich9000@gmail.com> 2008-03-15 03:34:06 +0000
commit: dc281aae7775d90bb1cd06754fb56e04f4903615 (patch)
tree: 606959c72735bb75a41996531a6376007e0ead07
parent: 323bb8b60f7b383c0085ec3f489b46cb32e90fa5 (diff)
download: nanoengineer-dc281aae7775d90bb1cd06754fb56e04f4903615.tar.gz
nanoengineer-dc281aae7775d90bb1cd06754fb56e04f4903615.zip
27 files changed, 145 insertions, 10 deletions
diff --git a/cad/plugins/NanoVision-1/src/AboutBox.cpp b/cad/plugins/NanoVision-1/src/AboutBox.cpp
new file mode 100644
index 000000000..5bd13c460
--- /dev/null
+++ b/cad/plugins/NanoVision-1/src/AboutBox.cpp
@@ -0,0 +1,12 @@
+// Copyright 2008 Nanorex, Inc.  See LICENSE file for details.
+
+#include "AboutBox.h"
+
+
+/* CONSTRUCTORS */
+AboutBox::AboutBox(QWidget *parent) : QDialog(parent) {
+		
+	setupUi(this);
+	setWindowFlags(Qt::Dialog | Qt::Tool);
+}
+
diff --git a/cad/plugins/NanoVision-1/src/AboutBox.h b/cad/plugins/NanoVision-1/src/AboutBox.h
new file mode 100644
index 000000000..63ac8bb79
--- /dev/null
+++ b/cad/plugins/NanoVision-1/src/AboutBox.h
@@ -0,0 +1,17 @@
+// Copyright 2008 Nanorex, Inc.  See LICENSE file for details.
+
+#ifndef ABOUTBOX_H
+#define ABOUTBOX_H
+
+#include <QDialog>
+
+#include "ui_AboutBox.h"
+
+class AboutBox : public QDialog, private Ui_AboutBox {
+	Q_OBJECT
+	
+	public:
+		AboutBox(QWidget *parent = 0);
+};
+
+#endif
diff --git a/cad/plugins/NanoVision-1/src/AboutBox.ui b/cad/plugins/NanoVision-1/src/AboutBox.ui
new file mode 100644
index 000000000..4a8add86f
--- /dev/null
+++ b/cad/plugins/NanoVision-1/src/AboutBox.ui
@@ -0,0 +1,98 @@
+<ui version="4.0" >
+ <class>AboutBox</class>
+ <widget class="QDialog" name="AboutBox" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>418</width>
+    <height>517</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>0</hsizetype>
+    <vsizetype>0</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="maximumSize" >
+   <size>
+    <width>418</width>
+    <height>517</height>
+   </size>
+  </property>
+  <property name="windowTitle" >
+   <string>About NanoVision-1</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string/>
+     </property>
+     <property name="pixmap" >
+      <pixmap resource="application.qrc" >:/Icons/splashscreen.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="application.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>AboutBox</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>AboutBox</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/cad/plugins/NanoVision-1/src/Icons/File/Close.png b/cad/plugins/NanoVision-1/src/Icons/File/Close.png
deleted file mode 100644
index b049b6886..000000000
--- a/cad/plugins/NanoVision-1/src/Icons/File/Close.png
+++ /dev/null
diff --git a/cad/plugins/NanoVision-1/src/Icons/File/Open.png b/cad/plugins/NanoVision-1/src/Icons/File/Open.png
index c70156b99..93888d806 100755
--- a/cad/plugins/NanoVision-1/src/Icons/File/Open.png
+++ b/cad/plugins/NanoVision-1/src/Icons/File/Open.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/Tools/AbortJob.png b/cad/plugins/NanoVision-1/src/Icons/Tools/AbortJob.png
new file mode 100644
index 000000000..ff15acc81
--- /dev/null
+++ b/cad/plugins/NanoVision-1/src/Icons/Tools/AbortJob.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/Tools/OpenActiveJob.png b/cad/plugins/NanoVision-1/src/Icons/Tools/OpenActiveJob.png
new file mode 100644
index 000000000..3fe958978
--- /dev/null
+++ b/cad/plugins/NanoVision-1/src/Icons/Tools/OpenActiveJob.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/atom.png b/cad/plugins/NanoVision-1/src/Icons/atom.png
index 2bf1c96f5..759dabda1 100755
--- a/cad/plugins/NanoVision-1/src/Icons/atom.png
+++ b/cad/plugins/NanoVision-1/src/Icons/atom.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/atom_set.png b/cad/plugins/NanoVision-1/src/Icons/atom_set.png
index b07e2e9ef..646d23dfe 100755
--- a/cad/plugins/NanoVision-1/src/Icons/atom_set.png
+++ b/cad/plugins/NanoVision-1/src/Icons/atom_set.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/home.png b/cad/plugins/NanoVision-1/src/Icons/home.png
index 19b80747d..42639ee2d 100644
--- a/cad/plugins/NanoVision-1/src/Icons/home.png
+++ b/cad/plugins/NanoVision-1/src/Icons/home.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/input_file.png b/cad/plugins/NanoVision-1/src/Icons/input_file.png
index 430e27b3b..50d0686c3 100644
--- a/cad/plugins/NanoVision-1/src/Icons/input_file.png
+++ b/cad/plugins/NanoVision-1/src/Icons/input_file.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/input_files.png b/cad/plugins/NanoVision-1/src/Icons/input_files.png
index 81cc7e64a..04434c88a 100644
--- a/cad/plugins/NanoVision-1/src/Icons/input_files.png
+++ b/cad/plugins/NanoVision-1/src/Icons/input_files.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/input_parameters.png b/cad/plugins/NanoVision-1/src/Icons/input_parameters.png
index 85d846268..7f9a371fd 100644
--- a/cad/plugins/NanoVision-1/src/Icons/input_parameters.png
+++ b/cad/plugins/NanoVision-1/src/Icons/input_parameters.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/results.png b/cad/plugins/NanoVision-1/src/Icons/results.png
index 1d36f9d1f..44dcc7c9e 100644
--- a/cad/plugins/NanoVision-1/src/Icons/results.png
+++ b/cad/plugins/NanoVision-1/src/Icons/results.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/results_summary.png b/cad/plugins/NanoVision-1/src/Icons/results_summary.png
index f938ad557..5f46cbe03 100644
--- a/cad/plugins/NanoVision-1/src/Icons/results_summary.png
+++ b/cad/plugins/NanoVision-1/src/Icons/results_summary.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/results_summary2.png b/cad/plugins/NanoVision-1/src/Icons/results_summary2.png
index ed23e6443..6fa115645 100644
--- a/cad/plugins/NanoVision-1/src/Icons/results_summary2.png
+++ b/cad/plugins/NanoVision-1/src/Icons/results_summary2.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/trajectories.png b/cad/plugins/NanoVision-1/src/Icons/trajectories.png
index 2ed9038c7..2de49b124 100644
--- a/cad/plugins/NanoVision-1/src/Icons/trajectories.png
+++ b/cad/plugins/NanoVision-1/src/Icons/trajectories.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/trajectory_first.png b/cad/plugins/NanoVision-1/src/Icons/trajectory_first.png
index c2c5bc708..26bb4993e 100644
--- a/cad/plugins/NanoVision-1/src/Icons/trajectory_first.png
+++ b/cad/plugins/NanoVision-1/src/Icons/trajectory_first.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/trajectory_last.png b/cad/plugins/NanoVision-1/src/Icons/trajectory_last.png
index c0c0723d1..9dd75d3cf 100644
--- a/cad/plugins/NanoVision-1/src/Icons/trajectory_last.png
+++ b/cad/plugins/NanoVision-1/src/Icons/trajectory_last.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/trajectory_pause.png b/cad/plugins/NanoVision-1/src/Icons/trajectory_pause.png
index b9ff619e1..6cf370688 100644
--- a/cad/plugins/NanoVision-1/src/Icons/trajectory_pause.png
+++ b/cad/plugins/NanoVision-1/src/Icons/trajectory_pause.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/trajectory_play.png b/cad/plugins/NanoVision-1/src/Icons/trajectory_play.png
index 4ca66605a..f884d30c4 100644
--- a/cad/plugins/NanoVision-1/src/Icons/trajectory_play.png
+++ b/cad/plugins/NanoVision-1/src/Icons/trajectory_play.png
diff --git a/cad/plugins/NanoVision-1/src/Icons/trajectory_stop.png b/cad/plugins/NanoVision-1/src/Icons/trajectory_stop.png
index b53e255b5..70220123b 100644
--- a/cad/plugins/NanoVision-1/src/Icons/trajectory_stop.png
+++ b/cad/plugins/NanoVision-1/src/Icons/trajectory_stop.png
diff --git a/cad/plugins/NanoVision-1/src/MainWindowTabWidget.ui b/cad/plugins/NanoVision-1/src/MainWindowTabWidget.ui
index 6af0504e5..5807faa00 100644
--- a/cad/plugins/NanoVision-1/src/MainWindowTabWidget.ui
+++ b/cad/plugins/NanoVision-1/src/MainWindowTabWidget.ui
@@ -27,6 +27,12 @@
      <property name="currentIndex" >
       <number>0</number>
      </property>
+     <property name="iconSize" >
+      <size>
+       <width>32</width>
+       <height>26</height>
+      </size>
+     </property>
      <widget class="QWidget" name="resultsTab" >
       <attribute name="title" >
        <string/>
diff --git a/cad/plugins/NanoVision-1/src/ResultsWindow.cpp b/cad/plugins/NanoVision-1/src/ResultsWindow.cpp
index c2115ea91..c3256f40d 100644
--- a/cad/plugins/NanoVision-1/src/ResultsWindow.cpp
+++ b/cad/plugins/NanoVision-1/src/ResultsWindow.cpp
@@ -277,8 +277,7 @@ setupMoleculeSetResultsSubtree(NXMoleculeSet *molSetPtr,
         new StructureGraphicsTreeItem(molSetPtr, this, parentItem);
     molSetItem->setIcon(0, atomSetIcon);
     molSetItem->setText(0, (molSetPtr->getTitle()).c_str());
-    molSetItem->setFlags(Qt::ItemIsEnabled);
-    molSetItem->setFlags(Qt::ItemIsSelectable);
+    molSetItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
     
 /*    QObject::connect((QTreeWidget*) molSetItem,
                      SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
@@ -295,8 +294,7 @@ setupMoleculeSetResultsSubtree(NXMoleculeSet *molSetPtr,
             new StructureGraphicsTreeItem(molPtr, this, molSetItem);
         molItem->setIcon(0,atomIcon);
         molItem->setText(0, tr(molPtr->GetTitle()));
-		molItem->setFlags(Qt::ItemIsEnabled);
-        molItem->setFlags(Qt::ItemIsSelectable);
+		molItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
     }
     
     NXMoleculeSetIterator childMolSetIter;
diff --git a/cad/plugins/NanoVision-1/src/application.qrc b/cad/plugins/NanoVision-1/src/application.qrc
index e554f3158..b93f8e3eb 100644
--- a/cad/plugins/NanoVision-1/src/application.qrc
+++ b/cad/plugins/NanoVision-1/src/application.qrc
@@ -1,7 +1,8 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
       <file>Icons/File/Open.png</file>
-      <file>Icons/File/Close.png</file>
+	  <file>Icons/Tools/OpenActiveJob.png</file>
+	  <file>Icons/Tools/AbortJob.png</file>
       <file>Icons/splashscreen.png</file>
       <file>Icons/eye-icon.png</file>
       <file>Icons/home.png</file>
diff --git a/cad/plugins/NanoVision-1/src/nv1.cpp b/cad/plugins/NanoVision-1/src/nv1.cpp
index 6e1e92265..510f9587a 100644
--- a/cad/plugins/NanoVision-1/src/nv1.cpp
+++ b/cad/plugins/NanoVision-1/src/nv1.cpp
@@ -222,13 +222,13 @@ void nv1::createActions() {
     
 	// File
     openAction =
-        new QAction(QIcon(":/Icons/File/Open.png"), tr("&Open..."), this);
+        new QAction(QIcon(":/Icons/File/Open.png"), tr("&Open File..."), this);
     openAction->setShortcut(tr("Ctrl+O"));
     openAction->setStatusTip(tr("Open an existing file"));
     connect(openAction, SIGNAL(triggered()), this, SLOT(open()));
     
     closeAction =
-        new QAction(QIcon(":/Icons/File/Close.png"), tr("&Close"), this);
+        new QAction(tr("&Close File"), this);
     closeAction->setShortcut(tr("Ctrl+W"));
     closeAction->setStatusTip(tr("Close and open file"));
     connect(closeAction, SIGNAL(triggered()), this, SLOT(close()));
@@ -250,7 +250,8 @@ void nv1::createActions() {
 	//
 	// Job Management
 	openJobsAction =
-        new QAction(QIcon(":/Icons/File/Open.png"), tr("&Open Active Job..."), this);
+        new QAction(QIcon(":/Icons/Tools/OpenActiveJob.png"),
+					tr("&Open Active Job..."), this);
     openJobsAction->setStatusTip(tr("Open an active job"));
     connect(openJobsAction, SIGNAL(triggered()), this, SLOT(openActiveJobs()));
 	
@@ -346,7 +347,8 @@ void nv1::createMenus() {
 void nv1::createToolBars() {
     fileToolBar = addToolBar(tr("File"));
     fileToolBar->addAction(openAction);
-    fileToolBar->addAction(closeAction);
+	jobsToolBar = addToolBar(tr("Jobs"));
+	jobsToolBar->addAction(openJobsAction);
 }
 
 
@@ -385,7 +387,7 @@ void nv1::addMonitoredJob(const QString& processType, const QString& id,
 						  const QString& title) {
     QString actionTitle = tr("Abort %1").arg(title);
     abortJobAction =
-        new QAction(QIcon(":/Icons/File/Open.png"), actionTitle, this);
+        new QAction(QIcon(":/Icons/Tools/AbortJob.png"), actionTitle, this);
     abortJobAction->setStatusTip(tr("Abort a running job"));
     
     QSignalMapper* signalMapper = new QSignalMapper(this);
diff --git a/cad/plugins/NanoVision-1/src/nv1.h b/cad/plugins/NanoVision-1/src/nv1.h
index f1b952552..8b302f8c1 100644
--- a/cad/plugins/NanoVision-1/src/nv1.h
+++ b/cad/plugins/NanoVision-1/src/nv1.h
@@ -65,6 +65,7 @@ private:
 	NXEntityManager* entityManager;
 	
 	QToolBar* fileToolBar;
+	QToolBar* jobsToolBar;
 	QDockWidget* logDockWidget;
 
 	MainWindowTabWidget* mainWindowTabs;
author	Brian Helfrich <helfrich9000@gmail.com>	2008-03-15 03:34:06 +0000
committer	Brian Helfrich <helfrich9000@gmail.com>	2008-03-15 03:34:06 +0000
commit	dc281aae7775d90bb1cd06754fb56e04f4903615 (patch)
tree	606959c72735bb75a41996531a6376007e0ead07
parent	323bb8b60f7b383c0085ec3f489b46cb32e90fa5 (diff)
download	nanoengineer-dc281aae7775d90bb1cd06754fb56e04f4903615.tar.gz nanoengineer-dc281aae7775d90bb1cd06754fb56e04f4903615.zip