Minor bug fixes to NewBreeze v2.1.0, Wed Dec 4 22:04:40 UTC 2013

marcusbritanicus · Dec 4, 2013 · 8d8259e · 8d8259e
1 parent e240ab4
commit 8d8259e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 21 deletions.
diff --git a/Gui/ModelViews/Models/ApplicationsModel/NBApplicationsModel.cpp b/Gui/ModelViews/Models/ApplicationsModel/NBApplicationsModel.cpp
@@ -6,15 +6,6 @@
 
 #include <NBApplicationsModel.hpp>
 
-inline bool matchesFilter( QStringList filters, QString text ) {
-
-	foreach( QString filter, filters )
-		if ( text.contains( QRegExp( filter, Qt::CaseInsensitive, QRegExp::Wildcard ) ) )
-			return true;
-
-	return false;
-};
-
 NBApplicationsModel::NBApplicationsModel() : QAbstractItemModel() {
 
 	appEngine = NBAppEngine::instance();

diff --git a/Gui/ModelViews/Models/CatalogModel/NBCatalogModel.cpp b/Gui/ModelViews/Models/CatalogModel/NBCatalogModel.cpp
@@ -6,15 +6,6 @@
 
 #include <NBCatalogModel.hpp>
 
-inline bool matchesFilter( QStringList filters, QString text ) {
-
-	foreach( QString filter, filters )
-		if ( text.contains( QRegExp( filter, Qt::CaseInsensitive, QRegExp::Wildcard ) ) )
-			return true;
-
-	return false;
-};
-
 NBCatalogModel::NBCatalogModel() : QAbstractItemModel() {
 
 	rootItem = new NBCatalogItem();

diff --git a/Gui/ModelViews/Views/IconView/NBIconView.cpp b/Gui/ModelViews/Views/IconView/NBIconView.cpp
@@ -426,7 +426,7 @@ void NBIconView::dropEvent( QDropEvent *dpEvent ) {
 		else if ( dpEvent->keyboardModifiers() == ( Qt::ControlModifier | Qt::ShiftModifier | Qt::AltModifier ) ) {
 
 			qDebug() << "Ctrl+Shift+Alt+Drop. Alphabetical Copy activated";
-			QProcess::startDetached( "sh", QStringList() << "find -type f -print0 | sort -z | cpio -0 -pd " + mtpt )
+			QProcess::startDetached( "sh", QStringList() << "find -type f -print0 | sort -z | cpio -0 -pd " + mtpt );
 			emit acopy( args, mtpt );
 		}
 

diff --git a/Gui/ModelViews/Views/SidePanelView/NBSidePanelView.cpp b/Gui/ModelViews/Views/SidePanelView/NBSidePanelView.cpp
@@ -162,7 +162,7 @@ void NBSidePanel::dropEvent( QDropEvent *dpEvent ) {
 		else if ( dpEvent->keyboardModifiers() == ( Qt::ControlModifier | Qt::ShiftModifier | Qt::AltModifier ) ) {
 
 			qDebug() << "Ctrl+Shift+Alt+Drop. Alphabetical Copy activated";
-			QProcess::startDetached( "sh", QStringList() << "find -type f -print0 | sort -z | cpio -0 -pd " + mtpt )
+			QProcess::startDetached( "sh", QStringList() << "find -type f -print0 | sort -z | cpio -0 -pd " + mtpt );
 			emit copy( args, mtpt, NBIOMode::ACopy );
 		}
 

diff --git a/Gui/ModelViews/Views/TreeView/NBTreeView.cpp b/Gui/ModelViews/Views/TreeView/NBTreeView.cpp
@@ -304,7 +304,7 @@ void NBTreeView::dropEvent( QDropEvent *dpEvent ) {
 		else if ( dpEvent->keyboardModifiers() == ( Qt::ControlModifier | Qt::ShiftModifier | Qt::AltModifier ) ) {
 
 			qDebug() << "Ctrl+Shift+Alt+Drop. Alphabetical Copy activated";
-			QProcess::startDetached( "sh", QStringList() << "find -type f -print0 | sort -z | cpio -0 -pd " + mtpt )
+			QProcess::startDetached( "sh", QStringList() << "find -type f -print0 | sort -z | cpio -0 -pd " + mtpt );
 			emit acopy( args, mtpt );
 		}
 

diff --git a/NewBreeze.pro b/NewBreeze.pro
@@ -86,6 +86,7 @@ HEADERS += Gui/ModelViews/Views/CatalogView/NBCatalogDelegate.hpp
 HEADERS += Gui/ModelViews/Views/CatalogView/NBCatalogView.hpp
 HEADERS += Gui/ModelViews/Views/IconView/NBIconDelegate.hpp
 HEADERS += Gui/ModelViews/Views/IconView/NBIconView.hpp
+# HEADERS += Gui/ModelViews/Views/IconView/NBIconView2.hpp
 HEADERS += Gui/ModelViews/Views/OpenWithView/NBOpenWithDelegate.hpp
 HEADERS += Gui/ModelViews/Views/OpenWithView/NBOpenWithView.hpp
 HEADERS += Gui/ModelViews/Views/SidePanelView/NBSidePanelDelegate.hpp
@@ -202,6 +203,7 @@ SOURCES += Gui/ModelViews/Views/CatalogView/NBCatalogDelegate.cpp
 SOURCES += Gui/ModelViews/Views/CatalogView/NBCatalogView.cpp
 SOURCES += Gui/ModelViews/Views/IconView/NBIconDelegate.cpp
 SOURCES += Gui/ModelViews/Views/IconView/NBIconView.cpp
+# SOURCES += Gui/ModelViews/Views/IconView/NBIconView2.cpp
 SOURCES += Gui/ModelViews/Views/OpenWithView/NBOpenWithDelegate.cpp
 SOURCES += Gui/ModelViews/Views/OpenWithView/NBOpenWithView.cpp
 SOURCES += Gui/ModelViews/Views/SidePanelView/NBSidePanelDelegate.cpp