0.3.0b

Author: proton

mainwindow.cpp

@@ -9,6 +9,7 @@
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QClipboard>
+#include <QProcess>
 
 Settings settings;
 
@@ -230,16 +231,37 @@ void MainWindow::noteFontChanged()
 	}
 }
 
+void MainWindow::commandMenu()
+{
+	QPoint p = ui->mainToolBar->actionGeometry(&cmd_action).center();
+	p+=pos();
+	cmd_menu.exec(p);
+}
+
+void MainWindow::cmdExec(const QString & command)
+{
+	QProcess p;
+	QStringList args;
+	args << dir.absoluteFilePath(currentNote()->file.fileName());
+	p.start(command, args);
+	if(p.waitForStarted())
+	{
+		if(p.waitForFinished(10000))
+		{
+			QByteArray result = p.readAll();
+			tray.showMessage(command, QString::fromUtf8(result));
+		}
+	}
+}
+
 MainWindow::MainWindow(QWidget *parent)
-	: QMainWindow(parent), ui(new Ui::MainWindow), CurrentIndex(-1)
+	: QMainWindow(parent), ui(new Ui::MainWindow), CurrentIndex(-1), cmd_action(QIcon(":/res/exec.png"), tr("Commands"), parent)
 {
 	ui->setupUi(this);
 	//
 	restoreGeometry(settings.getDialogGeometry());
 	windowStateChanged();
 	//
-	//ui->mainToolBar->setOrientation(Qt::Vertical);
-	ui->mainToolBar->setContextMenuPolicy(Qt::NoContextMenu);
 	ui->mainToolBar->addAction(QIcon(":/res/add.png"), tr("Create new note"),
 							   this, SLOT(NewNote()));
 	ui->mainToolBar->addAction(QIcon(":/res/remove.png"), tr("Remove this note"),
@@ -257,9 +279,20 @@ MainWindow::MainWindow(QWidget *parent)
 	ui->mainToolBar->addSeparator();
 	ui->mainToolBar->addAction(QIcon(":/res/settings.png"), tr("Preferences"),
 							   this, SLOT(prefDialog()));
+	ui->mainToolBar->addSeparator();
+	ui->mainToolBar->addAction(&cmd_action);
+	connect(&cmd_action, SIGNAL(triggered()), this, SLOT(commandMenu()));
 	ui->mainToolBar->actions()[0]->setShortcut(QKeySequence::New);
 	ui->mainToolBar->actions()[1]->setShortcut(QKeySequence::Delete);
 	//
+	const QVector<Script>& cmdlist = settings.getComandList();
+	for(int i=0; i<cmdlist.size(); ++i)
+	{
+		cmd_menu.addAction(QIcon(cmdlist[i].icon), cmdlist[i].name, &cmd_mapper, SLOT(map()));
+		cmd_mapper.setMapping(cmd_menu.actions().last(), cmdlist[i].addr);
+		connect(&cmd_mapper, SIGNAL(mapped(const QString &)), this, SLOT(cmdExec(const QString &)));
+	}
+	//
 	cmenu.addAction(tr("Show"), this, SLOT(show()));
 	cmenu.addAction(tr("Hide"), this, SLOT(hide()));
 	cmenu.addSeparator();

mainwindow.h

@@ -6,6 +6,7 @@
 #include <QSystemTrayIcon>
 #include <QMenu>
 #include <QTimer>
+#include <QSignalMapper>
 
 #include "note.h"
 
@@ -32,6 +33,9 @@ class MainWindow : public QMainWindow
 	int CurrentIndex;
 	QSystemTrayIcon tray;
 	QMenu cmenu;
+	QAction cmd_action;
+	QMenu cmd_menu;
+	QSignalMapper cmd_mapper;
 	QTimer SaveTimer;
 	//
 	void LoadNotes();
@@ -41,7 +45,7 @@ class MainWindow : public QMainWindow
 	}
 	int currentIndex;
 	void SaveNote(int i);
-private slots:
+public slots:
 	void SaveCurrentNote();
 	void RemoveCurrentNote();
 	void RenameCurrentNote();
@@ -59,12 +63,15 @@ private slots:
 	//
 	void trayActivated(QSystemTrayIcon::ActivationReason reason);
 	//
+	void commandMenu();
 	void aboutDialog();
 	void prefDialog();
 	//
+	void cmdExec(const QString &);
+	//
 	void notesPathChanged();
 	void windowStateChanged();
-	void toolbarVisChanged();
+	void toolbarVisChanged();//TODO:подумать...
 	void noteFontChanged();
 };
 

mainwindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>296</width>
-    <height>396</height>
+    <width>294</width>
+    <height>394</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -43,6 +43,9 @@
    </layout>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
+   <property name="windowTitle">
+    <string>Show Toolbar</string>
+   </property>
    <property name="iconSize">
     <size>
      <width>16</width>

settings.cpp

@@ -15,6 +15,14 @@ Settings::Settings() : config("pDev", "zNotes")
 	StayTop = config.value("StayTop").toBool();
 	//
 	NoteFont.fromString(config.value("NoteFont").toString());
+	//
+	ComandList.resize(config.value("ComandCount").toInt());
+	for(int i=0; i<ComandList.size(); ++i)
+	{
+		ComandList[i].name = config.value(QString("ComandName%1").arg(i)).toString();
+		ComandList[i].icon = config.value(QString("ComandIcon%1").arg(i)).toString();
+		ComandList[i].addr = config.value(QString("ComandFile%1").arg(i)).toString();
+	}
 }
 
 void Settings::setNotesPath(const QString& path)

settings.h

@@ -8,6 +8,14 @@
 #include <QPoint>
 #include <QByteArray>
 #include <QFont>
+#include <QVector>
+
+struct Script
+{
+	QString name;
+	QString icon;
+	QString addr;
+};
 
 class Settings : public QObject
 {
@@ -23,6 +31,7 @@ class Settings : public QObject
 	inline bool getHideFrame()						{ return HideFrame; }
 	inline bool getStayTop()						{ return StayTop; }
 	inline const QFont& getNoteFont()				{ return NoteFont; }
+	inline const QVector<Script>& getComandList()		{ return ComandList; }
 	//
 	void setNotesPath(const QString& path);
 	void setLastNote(const QString& name);
@@ -46,6 +55,8 @@ class Settings : public QObject
 	bool StayTop;
 	//
 	QFont NoteFont;
+	//
+	QVector<Script> ComandList;
 signals:
 	void NotesPathChanged();
 	void WindowStateChanged();

translations/znotes_ru.ts

@@ -102,7 +102,7 @@ Do you want to move your notes to new place ?</source>
     <message>
         <location filename="../mainwindow.cpp" line="255"/>
         <source>Copy this note to clipboard</source>
-        <translation>Копировать содержимое в буффер обмена</translation>
+        <translation>Скопировать содержимое в буффер обмена</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="258"/>

znotes.png

@@ -2,7 +2,7 @@
 # Project created by QtCreator 2009-09-20T17:20:55
 # -------------------------------------------------
 TARGET = znotes
-VERSION = 0.2.7
+VERSION = 0.3.0
 QT += core \
     gui
 TEMPLATE = app

znotes.pro

@@ -12,5 +12,6 @@
         <file>res/copy.png</file>
         <file>res/next.png</file>
         <file>res/prev.png</file>
+        <file>res/exec.png</file>
     </qresource>
 </RCC>