Minor changes

jassuncao · Mar 14, 2020 · f5db6c3 · f5db6c3
1 parent 05ffe22
commit f5db6c3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 18 deletions.
diff --git a/octopart-test/octopart-test.pro b/octopart-test/octopart-test.pro
@@ -64,8 +64,3 @@ else:unix:!macx: LIBS += -L$$OUT_PWD/../widgets/ -lwidgets
 INCLUDEPATH += $$PWD/../widgets
 DEPENDPATH += $$PWD/../widgets
 
-win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../widgets/release/libwidgets.a
-else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../widgets/debug/libwidgets.a
-else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../widgets/release/widgets.lib
-else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../widgets/debug/widgets.lib
-else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../widgets/libwidgets.a
diff --git a/src/editormanagerview.cpp b/src/editormanagerview.cpp
@@ -4,7 +4,6 @@
 #include "editors/projecteditorwidget.h"
 #include "widgets/itemstreeview.h"
 #include "widgets/listnavigatorwidget.h"
-#include "widgets/qsearchlineedit.h"
 #include "styledbar.h"
 #include "minisplitter.h"
 #include <QHBoxLayout>

diff --git a/src/models/modelsrepository.cpp b/src/models/modelsrepository.cpp
@@ -145,10 +145,6 @@ void ModelsRepository::slotPartsDroppedInCategory(QVector<int> parts, TreeItem*
 
 void ModelsRepository::partsDroppedInStorage(QVector<int> parts, TreeItem* item)
 {    
-
-    //XXX: Show a dialog prompting the user to choose between moving all the stock to the target location or just some
-    //_partsModel->updatePartsStorage(parts, item->id());
-    //_partsModel->select();
     bool res = false;
     QVariant storageId = item->id();
     foreach (int partId, parts) {

diff --git a/src/todo.txt b/src/todo.txt
@@ -12,8 +12,6 @@ Based on a user action, the part name is looked up in octopart and the user can
 
 * Import project parts from a CSV file. Nice to have: Kicad.
 
-* Add a merge part dialog
-
 
 * Save options dialog window settings (width and height)
 
@@ -29,14 +27,12 @@ Based on a user action, the part name is looked up in octopart and the user can
 
 === Doing ===
 
-* Restructering part_parameters. Adds two new columns for min and max values. Taking advantage of sqlite datatypes to unify numeric and text values
-
-* Reenable drag & drop of parts into storage nodes
-- When dragging a part check if the part has stock in multiple storage. If so, ask if the user want's to move all of them into the same storage
-- (DONE) When dragging a stock entry from the detail view
-
 
 === Done ===
+* Dragging a stock entry from the detail view to a storage node
+* Dragging parts into storage node with confirmation
+* Restructering part_parameters. Adds two new columns for min and max values. Taking advantage of sqlite datatypes to unify numeric and text values
+* Add a merge part dialog
 * Change the following part associations: storage and condition.
 - Allow a part to have multiple storage locations
 - Remove the part condition association. Move the condition to association with storage location.