Cleanup odds and ends.

glabels/LabelModel.cpp

@@ -88,7 +88,6 @@ namespace glabels
 
 		mModified = true;
 
-		emit objectAdded( object );
 		emit changed();
 		emit modifiedChanged();
 	}
@@ -101,7 +100,6 @@ namespace glabels
 	{
 		mModified = true;
 
-		emit objectChanged( qobject_cast<LabelModelObject*>(sender()) );
 		emit changed();
 		emit modifiedChanged();
 	}
@@ -114,7 +112,6 @@ namespace glabels
 	{
 		mModified = true;
 
-		emit objectMoved( qobject_cast<LabelModelObject*>(sender()) );
 		emit changed();
 		emit modifiedChanged();
 	}
@@ -132,9 +129,10 @@ namespace glabels
 
 		mModified = true;
 
-		emit objectDeleted( object );
 		emit changed();
 		emit modifiedChanged();
+
+		delete object;
 	}
 
 
@@ -272,7 +270,8 @@ namespace glabels
 				selectedList << object;
 			}
 		}
-		
+
+		return selectedList;
 	}
 
 
@@ -395,7 +394,6 @@ namespace glabels
 		foreach ( LabelModelObject* object, selectedList )
 		{
 			mObjectList.push_back( object );
-			emit objectToTop( object );
 		}
 
 		mModified = true;
@@ -421,7 +419,6 @@ namespace glabels
 		foreach ( LabelModelObject* object, selectedList )
 		{
 			mObjectList.push_front( object );
-			emit objectToBottom( object );
 		}
 
 		mModified = true;

glabels/LabelModel.h

@@ -62,12 +62,6 @@ namespace glabels
 		void sizeChanged();
 		void selectionChanged();
 		void modifiedChanged();
-		void objectChanged( LabelModelObject* object );
-		void objectMoved( LabelModelObject* object );
-		void objectAdded( LabelModelObject* object );
-		void objectDeleted( LabelModelObject* object );
-		void objectToTop( LabelModelObject* object );
-		void objectToBottom( LabelModelObject* object );
 
 
 		/////////////////////////////////

glabels/MainWindow.cpp

@@ -100,6 +100,8 @@ namespace glabels
 		mView->setModel( mModel );
 
 		setDocVerbsEnabled( true );
+		setSelectionVerbsEnabled( false );
+		setMultiSelectionVerbsEnabled( false );
 		setTitle();
 
 		connect( mModel, SIGNAL(nameChanged()), this, SLOT(onNameChanged()) );
@@ -131,7 +133,6 @@ namespace glabels
 	///
 	void MainWindow::closeEvent( QCloseEvent *event )
 	{
-		qDebug() << "CLOSE EVENT";
 		writeSettings();
 		event->accept();
 	}
@@ -589,7 +590,6 @@ namespace glabels
 		fileSaveAction->setEnabled( enabled );
 		fileSaveAsAction->setEnabled( enabled );
 		filePrintAction->setEnabled( enabled );
-		fileCloseAction->setEnabled( enabled );
 		editUndoAction->setEnabled( enabled );
 		editRedoAction->setEnabled( enabled );
 		editCutAction->setEnabled( enabled );
@@ -895,7 +895,7 @@ namespace glabels
 	///
 	void MainWindow::editDelete()
 	{
-		qDebug() << "ACTION: edit->Delete";
+		mModel->deleteSelection();
 	}
 
 
@@ -904,7 +904,7 @@ namespace glabels
 	///
 	void MainWindow::editSelectAll()
 	{
-		qDebug() << "ACTION: edit->Select All";
+		mModel->selectAll();
 	}
 
 
@@ -913,7 +913,7 @@ namespace glabels
 	///
 	void MainWindow::editUnSelectAll()
 	{
-		qDebug() << "ACTION: edit->Un-select All";
+		mModel->unselectAll();
 	}
 
 

glabels/XmlLabel.cpp

@@ -172,6 +172,7 @@ glabels::LabelModel* glabels::XmlLabel::parseRootNode( const QDomElement &node )
 		}
 	}
 
+	label->clearModified();
 	return label;
 }