Preset browser

Makefile.Qt

@@ -550,7 +550,7 @@ OBJ11= $(T)undo.o $(T)undo_notes.o $(T)undo_fxs.o $(T)undo_temponodes.o $(T)undo
 #OBJ12= $(T)X11_visual.o $(T)X11_error.o $(T)X11_Ptask2Mtask.o $(T)X11_Bs_edit.o $(T)X11_Main.o $(T)X11_endprogram.o $(T)X11_disk.o $(T)X11_Player.o $(T)X11_memory.o $(T)X11_ReqType.o $(T)X11_keyboard.o $(T)X11_MidiProperties.o
 
 #Qt Spesific
-OBJ12= $(T)Qt_instruments.o $(T)Qt_visual.o $(T)GTK_visual.o $(T)Qt_Main.o $(T)KeyboardFocus.o $(T)Qt_endprogram.o $(T)Qt_EventReceiver.o $(T)Qt_colors.o $(T)Qt_Menues.o $(T)Qt_Fonts.o $(T)Qt_ReqType.o $(T)Qt_PopupMenu.o $(T)Qt_Bs_edit.o $(T)Qt_PluginWidget.o $(T)Qt_SliderPainter.o $(T)Qt_memory.o $(T)Qt_path_resolver.o $(T)Qt_settings.o $(T)Qt_disk.o $(T)Qt_MainWindow.o $(T)Qt_Time.o $(T)Qt_sequencer.o $(T)GTK_ReqType.o $(T)GTK_PopupMenu.o $(T)Qt_soundfilesaver_widget_callbacks.o $(T)Qt_comment_dialog.o $(T)Qt_song_properties.o $(T)Qt_preferences_callbacks.o $(T)Qt_tools_callbacks.o $(T)Qt_Error.o $(T)Qt_progresswindow.o $(T)Qt_check_for_updates.o $(T)Rational.o $(T)Qt_AutoBackups.o $(T)flowlayout.o
+OBJ12= $(T)Qt_instruments.o $(T)Qt_visual.o $(T)GTK_visual.o $(T)Qt_Main.o $(T)KeyboardFocus.o $(T)Qt_endprogram.o $(T)Qt_EventReceiver.o $(T)Qt_colors.o $(T)Qt_Menues.o $(T)Qt_Fonts.o $(T)Qt_ReqType.o $(T)Qt_PopupMenu.o $(T)Qt_Bs_edit.o $(T)Qt_PluginWidget.o $(T)Qt_SliderPainter.o $(T)Qt_memory.o $(T)Qt_path_resolver.o $(T)Qt_settings.o $(T)Qt_disk.o $(T)Qt_MainWindow.o $(T)Qt_Time.o $(T)Qt_sequencer.o $(T)GTK_ReqType.o $(T)GTK_PopupMenu.o $(T)Qt_soundfilesaver_widget_callbacks.o $(T)Qt_comment_dialog.o $(T)Qt_song_properties.o $(T)Qt_preferences_callbacks.o $(T)Qt_tools_callbacks.o $(T)Qt_Error.o $(T)Qt_progresswindow.o $(T)Qt_check_for_updates.o $(T)Rational.o $(T)Qt_AutoBackups.o $(T)flowlayout.o $(T)Qt_PresetBrowser.o
 
 #X11_MidiProperties.o $(T)X11_ClientMessages.o $(T)
 #Qt_Bs_edit.o $(T)
@@ -1631,6 +1631,19 @@ $(T)Qt_instruments.o: $(BUILD_DEPENDENCIES) $(P)Qt_instruments.cpp $(INSTRUMENTS
 # clang++ $(P)Qt_instruments.cpp $(QTOPT)
 
 
+$(T)Qt_PresetBrowser.o: $(BUILD_DEPENDENCIES) $(P)Qt_PresetBrowser.cpp $(INSTRUMENTS_DEPENDENCIES)
+	$(MOC) $(P)/Qt_PresetBrowser.cpp >$(P)/mQt_PresetBrowser.cpp
+	@echo
+	@echo "Changed (Qt_PresetBrowser.o):"
+	@echo $?
+	@echo
+	if [ $(BUILDTYPE) = RELEASE ] ; then \
+		$(CCC2) $(P)Qt_PresetBrowser.cpp $(QTOPT) $(SNDFILEOPT) -Wno-null-dereference  $(NO_ANALYZER) ; \
+	else \
+		$(CCC2) $(P)Qt_PresetBrowser.cpp $(QTOPT) $(SNDFILEOPT) -O0 -Wno-null-dereference $(NO_ANALYZER) ; \
+	fi
+
+
 $(P)mQt_instruments_widget_callbacks.h: $(BUILD_DEPENDENCIES) $(P)qt4_instruments_widget.ui $(P)create_source_from_ui.sh $(P)Qt_instruments_widget_callbacks.h
 	cd $(P) && ./create_source_from_ui.sh $(UIC) $(MOC) instruments_widget
 

Qt/EditorWidget.h

@@ -90,6 +90,10 @@ struct EditorLayoutWidget : public radium::KeyboardFocusFrame{
     : radium::KeyboardFocusFrame(NULL, radium::KeyboardFocusFrameType::EDITOR, true)
   {
     set_widget_takes_care_of_painting_everything(this);
+    // set size policy to expanding with factor 10
+    QSizePolicy editorSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
+    editorSizePolicy.setHorizontalStretch(10);
+    setSizePolicy(editorSizePolicy);
   }
 };
 

Qt/FocusSniffers.h

@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. */
 #include <QTableWidgetItem>
 #include <QKeyEvent>
 #include <QComboBox>
+#include <QTreeView>
 //#include <QFileDialog>
 
 #include "helpers.h"
@@ -80,6 +81,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. */
 //MakeFocusSnifferClass(QSpinBox);
 //MakeFocusSnifferClass(QDoubleSpinBox);
 MakeFocusSnifferClass(QLineEdit);
+MakeFocusSnifferClass(QTreeView);
 //MakeFocusSnifferClass(QComboBox);
 //MakeFocusSnifferClass(QFileDialog);
 //MakeFocusSnifferClass(QTextEdit);

Qt/Qt_Main.cpp

@@ -118,6 +118,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. */
 #include "Qt_colors_proc.h"
 #include "Qt_AutoBackups_proc.h"
 #include "Qt_Bs_edit_proc.h"
+#include "Qt_PresetBrowser.h"
 
 #include "Timer.hpp"
 #include "mTimer.hpp"
@@ -3603,6 +3604,8 @@ int radium_main(const char *arg){
       if(xsplitter->_strip_on_left_side)
         xsplitter->add_mixer_strip();
 
+      xsplitter->addWidget(createPresetBrowserWidget(SETTINGS_read_qstring("preset_root_folder", QDir::homePath() + QString::fromUtf8("/Radium Presets"))));
+
       editor->editor_layout_widget = new EditorLayoutWidget();
       editor->editor_layout_widget->setMinimumWidth(550);
       editor->editor_layout_widget->setMinimumHeight(100);
@@ -3615,6 +3618,19 @@ int radium_main(const char *arg){
 
       block_selector->resize(100,block_selector->height());
 
+      // resize browser at start - without this browser gets a lot of space
+      QList<int> sizes = xsplitter->sizes();
+      int browserIndex = xsplitter->indexOf(getPresetBrowserWidgetFrame());
+      int editorIndex = xsplitter->indexOf(editor->editor_layout_widget);
+
+      if (browserIndex != -1 && editorIndex != -1) {
+        int space = sizes.at(browserIndex) + sizes.at(editorIndex);
+
+        sizes[browserIndex] = space * 0.3;
+        sizes[editorIndex] = space - sizes.at(browserIndex);
+        xsplitter->setSizes(sizes);
+      }
+
       {
         SEQUENCER_WIDGET_initialize(main_window);
         createInstrumentsWidget();