moved changes from master to upstream-merge

1 files changed, 8 insertions, 1 deletions

diff --git a/proto-wine/ftnoir_protocol_wine.h b/proto-wine/ftnoir_protocol_wine.h
index f7346be9..23845d51 100644
--- a/proto-wine/ftnoir_protocol_wine.h
+++ b/proto-wine/ftnoir_protocol_wine.h
@@ -26,7 +26,9 @@ struct settings : opts
 
     value<int>     proton_appid{b, "proton-appid", 0};
     value<QVariant> proton_path{b, "proton-version", {} };
-    value<QString> wineprefix{b, "wineprefix", "~/.wine"};
+    value<QVariant> wine_select_path{b, "wine-select-version", {"WINE"}};
+    value<QString> wine_custom_path{b, "wine-custom-version", ""};
+    value<QString> wineprefix{b, "wineprefix", "~/Games/star-citizen/"};
     value<int>     protocol{b, "protocol", 2};
 };
 
@@ -77,6 +79,11 @@ private:
     settings s;
 
 private slots:
+    void onWinePathComboUpdated(QString selection);
+
+    void doBrowseWine();
+    void doBrowsePrefix();
+
     void doOK();
     void doCancel();
 };