Merge branch 'qt'

5 files changed, 16 insertions, 4 deletions

diff --git a/src/gui/stylepalette.cpp b/src/gui/stylepalette.cpp
index e3fea0b..b5e1475 100644
--- a/src/gui/stylepalette.cpp
+++ b/src/gui/stylepalette.cpp
@@ -57,6 +57,7 @@ StylePalette::StylePalette(QWidget *parent) :
     reloadStyles();
 
     connect(ui->styleListView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT( nodeStyleDoubleClicked(const QModelIndex&)) );
+	connect(ui->edgeStyleListView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(edgeStyleDoubleClicked(const QModelIndex&)));
 }
 
 StylePalette::~StylePalette()
@@ -151,7 +152,8 @@ void StylePalette::nodeStyleDoubleClicked(const QModelIndex &index)
 
 void StylePalette::edgeStyleDoubleClicked(const QModelIndex &index)
 {
-    // TODO
+	qDebug() << "got double click";
+	tikzit->activeWindow()->tikzScene()->applyActiveStyleToEdges();
 }
 
 void StylePalette::on_buttonOpenTikzstyles_clicked()
diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp
index 47464fe..1ddd945 100644
--- a/src/gui/tikzscene.cpp
+++ b/src/gui/tikzscene.cpp
@@ -585,6 +585,11 @@ void TikzScene::applyActiveStyleToNodes() {
     _tikzDocument->undoStack()->push(cmd);
 }
 
+void TikzScene::applyActiveStyleToEdges() {
+	ApplyStyleToEdgesCommand *cmd = new ApplyStyleToEdgesCommand(this, _styles->activeEdgeStyleName());
+	_tikzDocument->undoStack()->push(cmd);
+}
+
 void TikzScene::deleteSelectedItems()
 {
     QSet<Node*> selNodes;
diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h
index 4ac56c7..b6b2560 100644
--- a/src/gui/tikzscene.h
+++ b/src/gui/tikzscene.h
@@ -56,6 +56,7 @@ public:
     void reloadStyles();
     //void refreshSceneBounds();
     void applyActiveStyleToNodes();
+	void applyActiveStyleToEdges();
     void deleteSelectedItems();
     void copyToClipboard();
     void cutToClipboard();
diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp
index 5525cb7..c8221fe 100644
--- a/src/gui/undocommands.cpp
+++ b/src/gui/undocommands.cpp
@@ -284,6 +284,7 @@ void ApplyStyleToNodesCommand::undo()
         n->setStyleName(_oldStyles[n]);
         n->attachStyle();
     }
+	_scene->refreshAdjacentEdges(_oldStyles.keys());
 
     GraphUpdateCommand::undo();
 }
@@ -294,10 +295,13 @@ void ApplyStyleToNodesCommand::redo()
         n->setStyleName(_style);
         n->attachStyle();
     }
+	_scene->refreshAdjacentEdges(_oldStyles.keys());
+
     GraphUpdateCommand::redo();
 }
 
-ApplyStyleToEdgesCommand::ApplyStyleToEdgesCommand(TikzScene *scene, QString style, QUndoCommand *parent) :
+
+ApplyStyleToEdgesCommand::ApplyStyleToEdgesCommand(TikzScene * scene, QString style, QUndoCommand * parent) :
 	GraphUpdateCommand(scene, parent), _style(style), _oldStyles()
 {
 	foreach(QGraphicsItem *it, scene->selectedItems()) {
diff --git a/src/main.cpp b/src/main.cpp
index 4d6f9a7..699fbb0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -41,8 +41,8 @@ int main(int argc, char *argv[])
     tikzit->init(&a);
 	
     if (a.arguments().length() > 1) {
-		tikzit->open(a.arguments()[1]);
-	}
+		  tikzit->open(a.arguments()[1]);
+	  }
 
     return a.exec();
 }