--- gigedit/trunk/src/gigedit/mainwindow.cpp	2019/02/21 05:52:02	3477
+++ gigedit/trunk/src/gigedit/mainwindow.cpp	2019/10/24 11:16:26	3635
@@ -96,9 +96,9 @@
 
     if (!Settings::singleton()->autoRestoreWindowDimension) {
 #if GTKMM_MAJOR_VERSION >= 3
-        set_default_size(895, 600);
+        set_default_size(960, 600);
 #else
-        set_default_size(800, 600);
+        set_default_size(865, 600);
 #endif
         set_position(Gtk::WIN_POS_CENTER);
     }
@@ -2666,11 +2666,11 @@
             "backup your Gigasampler/GigaStudio files before editing them with "
             "this application.\n"
             "\n"
-            "Please report bugs to: http://bugs.linuxsampler.org"
+            "Please report bugs to: https://bugs.linuxsampler.org"
         );
     dialog.set_comments(sComment.c_str());
-    dialog.set_website("http://www.linuxsampler.org");
-    dialog.set_website_label("http://www.linuxsampler.org");
+    dialog.set_website("https://www.linuxsampler.org");
+    dialog.set_website_label("https://www.linuxsampler.org");
     dialog.set_position(Gtk::WIN_POS_CENTER);
     dialog.run();
 }
@@ -2856,7 +2856,24 @@
     ePitchbendRange(_("Pitchbend range"), 0, 48),
     ePianoReleaseMode(_("Piano release mode")),
     eDimensionKeyRangeLow(_("Keyswitching range low")),
-    eDimensionKeyRangeHigh(_("Keyswitching range high"))
+    eDimensionKeyRangeHigh(_("Keyswitching range high")),
+    table2(2,1),
+    eName2(_("Name")),
+    eCreationDate(_("Creation date")),
+    eComments(_("Comments")),
+    eProduct(_("Product")),
+    eCopyright(_("Copyright")),
+    eArtists(_("Artists")),
+    eGenre(_("Genre")),
+    eKeywords(_("Keywords")),
+    eEngineer(_("Engineer")),
+    eTechnician(_("Technician")),
+    eSoftware(_("Software")),
+    eMedium(_("Medium")),
+    eSource(_("Source")),
+    eSourceForm(_("Source form")),
+    eCommissioned(_("Commissioned")),
+    eSubject(_("Subject"))
 {
     if (!Settings::singleton()->autoRestoreWindowDimension) {
         //set_default_size(470, 390);
@@ -2865,6 +2882,9 @@
 
     set_title(_("Instrument Properties"));
 
+    tabs.append_page(vbox[1], _("Settings"));
+    tabs.append_page(vbox[2], _("Info"));
+
     eDimensionKeyRangeLow.set_tip(
         _("start of the keyboard area which should switch the "
           "\"keyswitching\" dimension")
@@ -2889,12 +2909,59 @@
 
     eName.signal_value_changed().connect(sig_name_changed.make_slot());
 
+    connect(eName2, &InstrumentProps::set_Name);
+    connectLambda(eCreationDate, [this](gig::String s) {
+        m->pInfo->CreationDate = s;
+    });
+    connectLambda(eComments, [this](gig::String s) {
+        m->pInfo->Comments = s;
+    });
+    connectLambda(eProduct, [this](gig::String s) {
+        m->pInfo->Product = s;
+    });
+    connectLambda(eCopyright, [this](gig::String s) {
+        m->pInfo->Copyright = s;
+    });
+    connectLambda(eArtists, [this](gig::String s) {
+        m->pInfo->Artists = s;
+    });
+    connectLambda(eGenre, [this](gig::String s) {
+        m->pInfo->Genre = s;
+    });
+    connectLambda(eKeywords, [this](gig::String s) {
+        m->pInfo->Keywords = s;
+    });
+    connectLambda(eEngineer, [this](gig::String s) {
+        m->pInfo->Engineer = s;
+    });
+    connectLambda(eTechnician, [this](gig::String s) {
+        m->pInfo->Technician = s;
+    });
+    connectLambda(eSoftware, [this](gig::String s) {
+        m->pInfo->Software = s;
+    });
+    connectLambda(eMedium, [this](gig::String s) {
+        m->pInfo->Medium = s;
+    });
+    connectLambda(eSource, [this](gig::String s) {
+        m->pInfo->Source = s;
+    });
+    connectLambda(eSourceForm, [this](gig::String s) {
+        m->pInfo->SourceForm = s;
+    });
+    connectLambda(eCommissioned, [this](gig::String s) {
+        m->pInfo->Commissioned = s;
+    });
+    connectLambda(eSubject, [this](gig::String s) {
+        m->pInfo->Subject = s;
+    });
+
+    // tab 1
 #if USE_GTKMM_GRID
     table.set_column_spacing(5);
 #else
     table.set_col_spacings(5);
 #endif
-
     table.add(eName);
     table.add(eIsDrum);
     table.add(eMIDIBank);
@@ -2908,15 +2975,41 @@
     table.add(eDimensionKeyRangeLow);
     table.add(eDimensionKeyRangeHigh);
 
-    add(vbox);
+    // tab 2
+#if USE_GTKMM_GRID
+    table2.set_column_spacing(5);
+#else
+    table2.set_col_spacings(5);
+#endif
+    table2.add(eName2);
+    table2.add(eCreationDate);
+    table2.add(eComments);
+    table2.add(eProduct);
+    table2.add(eCopyright);
+    table2.add(eArtists);
+    table2.add(eGenre);
+    table2.add(eKeywords);
+    table2.add(eEngineer);
+    table2.add(eTechnician);
+    table2.add(eSoftware);
+    table2.add(eMedium);
+    table2.add(eSource);
+    table2.add(eSourceForm);
+    table2.add(eCommissioned);
+    table2.add(eSubject);
+
+    add(vbox[0]);
 #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
     table.set_margin(5);
 #else
     table.set_border_width(5);
 #endif
-    vbox.pack_start(table);
+    vbox[1].pack_start(table);
+    vbox[2].pack_start(table2);
     table.show();
-    vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
+    table2.show();
+    vbox[0].pack_start(tabs);
+    vbox[0].pack_start(buttonBox, Gtk::PACK_SHRINK);
     buttonBox.set_layout(Gtk::BUTTONBOX_END);
 #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
     buttonBox.set_margin(5);
@@ -2932,7 +3025,7 @@
         sigc::mem_fun(*this, &InstrumentProps::hide));
 
     quitButton.show();
-    vbox.show();
+    vbox[0].show();
 #if HAS_GTKMM_SHOW_ALL_CHILDREN
     show_all_children();
 #endif
@@ -2943,10 +3036,30 @@
     update(instrument);
 
     update_model++;
+
+    // tab 1
     eName.set_value(instrument->pInfo->Name);
     eIsDrum.set_value(instrument->IsDrum);
     eMIDIBank.set_value(instrument->MIDIBank);
     eMIDIProgram.set_value(instrument->MIDIProgram);
+    // tab 2
+    eName2.set_value(instrument->pInfo->Name);
+    eCreationDate.set_value(instrument->pInfo->CreationDate);
+    eComments.set_value(instrument->pInfo->Comments);
+    eProduct.set_value(instrument->pInfo->Product);
+    eCopyright.set_value(instrument->pInfo->Copyright);
+    eArtists.set_value(instrument->pInfo->Artists);
+    eGenre.set_value(instrument->pInfo->Genre);
+    eKeywords.set_value(instrument->pInfo->Keywords);
+    eEngineer.set_value(instrument->pInfo->Engineer);
+    eTechnician.set_value(instrument->pInfo->Technician);
+    eSoftware.set_value(instrument->pInfo->Software);
+    eMedium.set_value(instrument->pInfo->Medium);
+    eSource.set_value(instrument->pInfo->Source);
+    eSourceForm.set_value(instrument->pInfo->SourceForm);
+    eCommissioned.set_value(instrument->pInfo->Commissioned);
+    eSubject.set_value(instrument->pInfo->Subject);
+
     update_model--;
 }