Removed unnecessary files

[ADDED] AlertWindow für später

.gitignore

@@ -1,5 +1,6 @@
+/out/production
 /.idea
-/out
 /jLSLauncher.iml
-/config.dat
+/out/artifacts/jLSLauncher_jar/config.json
-# Created by .ignore support plugin (hsz.mobi)
+/config.json
+# Created by .ignore support plugin (hsz.mobi)

README.md

@@ -0,0 +1,41 @@
+# jLSLauncher - Livestreamer launching utility
+### Download
+
+A pre-compiled `.jar`-file can be downloaded here: https://dev.ixab.de/da/jLSLauncher/raw/master/out/artifacts/jLSLauncher_jar/jLSLauncher.jar
+
+### Required Software
+
+* Java (minimum required is v7) - https://www.java.com/de/download/
+* Livestreamer
+
+### Installation of Livestreamer (Windows)
+
+1. Download Livestreamer for Windows: http://docs.livestreamer.io/install.html#zip-archive
+2. Extract the Zip-File to a folder of your choice.
+
+### Installation of Livestreamer (Linux)
+
+Please use your distribution's packet manager. 
+Optionally you can download Livestreamer here: http://docs.livestreamer.io/install.html
+
+### Installation von jLSLauncher
+
+`jLSLauncher.jar` does not need an installation and can be executed as is.  
+You can move or copy this tool to any other location you like.  
+The configuration is stored in a file named `config.json` which, if present, has to be moved to the same location.
+
+### Usage of jLSLauncher
+
+Double click `jLSLauncher.jar`.
+If there is no program associated to launching `*.jar` files, jLSLauncher has to be launched via console/shell with the following commands:
+* Windows: `java -jar X:\Pfad\zu\jLSLauncher.jar`
+* Linux: `java -jar /pfad/zu/jLSLauncher.jar`
+
+At the first start of jLSLauncher a *Open file* dialog is displayed. You'll have to point this to the previously extracted `livestreamer.exe` or `livestreamer` binary file on Linux.
+
+### Bug Reports
+
+Please use the Issue-Tracker at: https://dev.ixab.de/da/jLSLauncher/issues
+Alternative method is to write a mail to da-bugreport@ixab.de
+
+For detailed debug output, please start jLSLauncher via console or shell.

src/com/ixab/ConfigHandling/Config.java

@@ -6,11 +6,44 @@ import java.util.ArrayList;
 public class Config implements Serializable {
     private String LSPath;
     private ArrayList<StreamConfigItem> streamItems;
+
+    public int getSortStreamsBy() {
+        return sortStreamsBy;
+    }
+
+    public void setSortStreamsBy(int sortStreamsBy) {
+        this.sortStreamsBy = sortStreamsBy;
+    }
+
+    private int sortStreamsBy;
+
+    private String proxy;
+
+    public int getLastSelectedStream() {
+        return lastSelectedStream;
+    }
+
+    public void setLastSelectedStream(int lastSelectedStream) {
+        this.lastSelectedStream = lastSelectedStream;
+    }
+
+    private int lastSelectedStream;
+    public int getLastSelectedQuality() {
+        return lastSelectedQuality;
+    }
+    public void setLastSelectedQuality(int lastSelectedQuality) {
+        this.lastSelectedQuality = lastSelectedQuality;
+    }
+    private int lastSelectedQuality;
     public Config() {
         this.streamItems = new ArrayList<StreamConfigItem>();
+        setSortStreamsBy(1);
+        setLastSelectedStream(-1);
+        setLastSelectedQuality(-1);
     }
     public void setLSPath(String path) {
         this.LSPath = path;
+        ConfigFileIOHandler.save();
     }
     public String getLSPath() {
         return this.LSPath;
@@ -21,9 +54,11 @@ public class Config implements Serializable {
     }
     public void addStream(String streamName) {
         this.streamItems.add(new StreamConfigItem(streamName));
+        ConfigFileIOHandler.save();
     }
     public void removeStream(Object stream) {
         this.streamItems.remove(stream);
+        ConfigFileIOHandler.save();
     }
     public ArrayList<StreamConfigItem> getStreams() {
         return this.streamItems;
@@ -33,5 +68,13 @@ public class Config implements Serializable {
     }
     public void replaceStreamList(ArrayList<StreamConfigItem> list) {
         this.streamItems = list;
+        ConfigFileIOHandler.save();
+    }
+
+    public String getProxy() {
+        return proxy;
+    }
+    public void setProxy(String proxy) {
+        this.proxy = proxy;
     }
 }

src/com/ixab/ConfigHandling/ConfigFileIOHandler.java

@@ -1,53 +1,61 @@
 package com.ixab.ConfigHandling;
 
+import com.cedarsoftware.util.io.JsonReader;
+import com.cedarsoftware.util.io.JsonWriter;
 import com.ixab.Logging.Logger;
 
 import java.io.*;
+import java.util.Scanner;
 
 public class ConfigFileIOHandler {
     public static Config load(String path) {
-        Config c = null;
+
-        try
+        String content;
-        {
+        StringBuilder sb = new StringBuilder();
-            FileInputStream fileIn = new FileInputStream(path);
+        try {
-            ObjectInputStream in = new ObjectInputStream(fileIn);
+            String line = null;
-            c = (Config) in.readObject();
+            FileReader fr = new FileReader(path);
-            in.close();
+            BufferedReader br = new BufferedReader(fr);
-            fileIn.close();
+            while ((line = br.readLine()) != null) {
-        }catch(IOException i)
+                sb.append(line);
-        {
+            }
-            i.printStackTrace();
+            br.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
             return null;
-        }catch(ClassNotFoundException e)
+        } catch (IOException e) {
-        {
-            Logger.print("Config class not found");
             e.printStackTrace();
             return null;
         }
-        return c;
+        content = sb.toString();
+        Config c = (Config) JsonReader.jsonToJava(content);
+        if (c instanceof Config) {
+            Logger.print("Config loaded.");
+            return c;
+        } else {
+            return null;
+        }
     }
     public static void save(Config c, String path) {
-        try
+        try {
-        {
+            FileWriter fw = new FileWriter(path);
-            FileOutputStream fileOut =
+            BufferedWriter bw = new BufferedWriter(fw);
-                    new FileOutputStream("config.dat");
+            bw.write(JsonWriter.formatJson(JsonWriter.objectToJson(c)));
-            ObjectOutputStream out = new ObjectOutputStream(fileOut);
+            bw.close();
-            out.writeObject(c);
+            Logger.print("Config saved.");
-            out.close();
+        } catch (FileNotFoundException e) {
-            fileOut.close();
+            e.printStackTrace();
-            Logger.print("Config data is saved in config.dat");
+        } catch (IOException e) {
-        }catch(IOException i)
+            e.printStackTrace();
-        {
-            i.printStackTrace();
         }
     }
     public static Config load() {
-        return load("config.dat");
+        return load("config.json");
     }
     public static void save(Config c) {
-        save(c, "config.dat");
+        save(c, "config.json");
     }
     public static void save() {
-        save(ConfigFileInstanceHandler.getConfig(), "config.dat");
+        save(ConfigFileInstanceHandler.getConfig(), "config.json");
     }
 }

src/com/ixab/ConfigHandling/StreamConfigItem.java

@@ -1,5 +1,6 @@
 package com.ixab.ConfigHandling;
 
+import com.ixab.Logging.Logger;
 import com.ixab.StreamHandling.StreamInfo;
 
 import java.awt.image.BufferedImage;
@@ -32,6 +33,7 @@ public class StreamConfigItem implements Serializable {
         this.category = StreamInfo.getGame();
     }
     public void refreshInfo() {
+        Logger.print("Refreshing stream data for " + this.name, this);
         this.getInfo();
     }
 

src/com/ixab/ConfigHandling/StreamConfigSorter.java

@@ -4,6 +4,31 @@ import java.util.ArrayList;
 
 public class StreamConfigSorter {
     public static ArrayList<StreamConfigItem> sortStreamItemArrayList(ArrayList<StreamConfigItem> list) {
+        switch (ConfigFileInstanceHandler.getConfig().getSortStreamsBy()) {
+            case 1: return sortByStatus(list);
+            case 2: return sortByViewerCountAsc(list);
+            case 3: return sortByViewerCountDesc(list);
+            case 4: return sortByNameAsc(list);
+            default: return sortByStatus(list);
+        }
+    }
+
+    private static ArrayList<StreamConfigItem> sortByViewerCountAsc(ArrayList<StreamConfigItem> list) {
+        // TODO: implement
+        return null;
+    }
+
+    private static ArrayList<StreamConfigItem> sortByViewerCountDesc(ArrayList<StreamConfigItem> list) {
+        // TODO: implement
+        return null;
+    }
+
+    private static ArrayList<StreamConfigItem> sortByNameAsc(ArrayList<StreamConfigItem> list) {
+        // TODO: implement
+        return null;
+    }
+
+    private static ArrayList<StreamConfigItem> sortByStatus(ArrayList<StreamConfigItem> list) {
         ArrayList<StreamConfigItem> result = new ArrayList<StreamConfigItem>();
         for (int i = 0; i<list.size(); i++) {
             if (list.get(i).getStatus()) {

src/com/ixab/GUI/AlertWindow.form

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.ixab.GUI.AlertWindow">
+  <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="10" left="10" bottom="10" right="10"/>
+    <constraints>
+      <xy x="48" y="54" width="436" height="297"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="94766" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <hspacer id="98af6">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+          </hspacer>
+          <grid id="9538f" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="e7465" class="javax.swing.JButton" binding="buttonOK">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="OK"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+        </children>
+      </grid>
+      <grid id="e3588" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="4c1c4" class="javax.swing.JLabel" binding="message">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Label"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+    </children>
+  </grid>
+</form>

src/com/ixab/GUI/AlertWindow.java

@@ -0,0 +1,47 @@
+package com.ixab.GUI;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class AlertWindow extends JDialog {
+    private JPanel contentPane;
+    private JButton buttonOK;
+    private JLabel message;
+
+    public AlertWindow(String s) {
+        message.setText(s);
+        setContentPane(contentPane);
+        setModal(true);
+        getRootPane().setDefaultButton(buttonOK);
+
+        buttonOK.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                onOK();
+            }
+        });
+    }
+
+    private void onOK() {
+// add your code here
+        dispose();
+    }
+
+    public void close() {
+        dispose();
+    }
+
+    public static void main(String[] args) {
+        AlertWindow dialog = new AlertWindow("unused main() in alertwindow");
+        dialog.pack();
+        dialog.setVisible(true);
+        System.exit(0);
+    }
+    public static AlertWindow main(String s) {
+        AlertWindow dialog = new AlertWindow(s);
+        dialog.pack();
+        dialog.setVisible(true);
+        System.exit(0);
+        return dialog;
+    }
+}

src/com/ixab/GUI/ErrorMessageGate.java

@@ -1,7 +1,10 @@
 package com.ixab.GUI;
 
+import com.ixab.Logging.Logger;
+
 public class ErrorMessageGate {
     public static void setErrorText(String s) {
+        Logger.print(s);
         MainWindow mw = MainWindowGate.getMainWindow();
         mw.getErrorLabel().setText(s);
     }

src/com/ixab/GUI/MainWindow.form

@@ -1,56 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.ixab.GUI.MainWindow">
-  <grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="4" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="650" height="500"/>
+      <xy x="20" y="20" width="680" height="500"/>
     </constraints>
     <properties>
-      <minimumSize width="650" height="400"/>
+      <minimumSize width="680" height="440"/>
-      <preferredSize width="650" height="400"/>
+      <preferredSize width="680" height="440"/>
     </properties>
     <border type="none"/>
     <children>
-      <component id="cb567" class="javax.swing.JComboBox" binding="comboBoxStreams">
-        <constraints>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-      </component>
-      <component id="35b31" class="javax.swing.JComboBox" binding="comboBoxQuality">
-        <constraints>
-          <grid row="0" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-      </component>
-      <component id="cb42d" class="javax.swing.JLabel">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Stream:"/>
-        </properties>
-      </component>
-      <component id="3b81f" class="javax.swing.JLabel">
-        <constraints>
-          <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Qualität:"/>
-        </properties>
-      </component>
-      <component id="7c5a1" class="javax.swing.JButton" binding="buttonRemoveStream" default-binding="true">
-        <constraints>
-          <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Ausgw. Stream entfernen"/>
-        </properties>
-      </component>
       <grid id="7567d" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="5" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -71,7 +35,7 @@
               <text value="Kategorie:"/>
             </properties>
           </component>
-          <grid id="31cd7" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="31cd7" layout-manager="GridLayoutManager" row-count="5" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
               <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -90,7 +54,7 @@
               <grid id="8ebda" binding="panelPreviewImage" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
-                  <grid row="0" column="1" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                  <grid row="0" column="1" row-span="5" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
                     <minimum-size width="320" height="180"/>
                     <preferred-size width="320" height="180"/>
                     <maximum-size width="320" height="180"/>
@@ -102,24 +66,56 @@
                 <border type="none"/>
                 <children/>
               </grid>
-              <hspacer id="8b583">
-                <constraints>
-                  <grid row="0" column="2" row-span="2" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-                </constraints>
-              </hspacer>
               <vspacer id="edf84">
                 <constraints>
-                  <grid row="1" column="0" row-span="2" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                  <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
                 </constraints>
               </vspacer>
+              <vspacer id="f8cd8">
+                <constraints>
+                  <grid row="4" column="2" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                </constraints>
+              </vspacer>
+              <component id="a5ab7" class="javax.swing.JButton" binding="vorherigerButton" default-binding="true">
+                <constraints>
+                  <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="&lt; vorheriger"/>
+                </properties>
+              </component>
+              <component id="1cf2f" class="javax.swing.JButton" binding="nächsterButton" default-binding="true">
+                <constraints>
+                  <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="nächster &gt;"/>
+                </properties>
+              </component>
+              <component id="be49e" class="javax.swing.JButton" binding="buttonPlayStream" default-binding="true">
+                <constraints>
+                  <grid row="1" column="2" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="Stream abspielen"/>
+                </properties>
+              </component>
               <component id="8b335" class="javax.swing.JButton" binding="buttonReloadStreamData">
                 <constraints>
-                  <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                  <grid row="2" column="2" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <text value="Stream Daten neu laden"/>
                 </properties>
               </component>
+              <component id="48958" class="javax.swing.JButton" binding="buttonReloadAllStreamData">
+                <constraints>
+                  <grid row="3" column="2" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="Alle Stream Daten neu laden"/>
+                </properties>
+              </component>
             </children>
           </grid>
           <component id="7fec7" class="javax.swing.JTextField" binding="textFieldStreamTitle">
@@ -207,30 +203,14 @@
       <grid id="47127" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="2" column="2" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children>
-          <component id="48958" class="javax.swing.JButton" binding="buttonReloadAllStreamData">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Alle Stream Daten neu laden"/>
-            </properties>
-          </component>
-          <component id="be49e" class="javax.swing.JButton" binding="buttonPlayStream" default-binding="true">
-            <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Stream abspielen"/>
-            </properties>
-          </component>
           <component id="95ee2" class="javax.swing.JButton" binding="buttonSettings" default-binding="true">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="0" row-span="2" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Einstellungen"/>
@@ -244,12 +224,20 @@
               <text value="Neuen Stream hinzufügen"/>
             </properties>
           </component>
+          <component id="7c5a1" class="javax.swing.JButton" binding="buttonRemoveStream" default-binding="true">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Ausgw. Stream entfernen"/>
+            </properties>
+          </component>
         </children>
       </grid>
       <grid id="c88e9" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="5" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="3" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <minimum-size width="-1" height="32"/>
             <preferred-size width="-1" height="32"/>
             <maximum-size width="-1" height="32"/>
@@ -275,6 +263,51 @@
           </hspacer>
         </children>
       </grid>
+      <grid id="7eaaf" layout-manager="GridLayoutManager" row-count="2" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="cb42d" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Stream:"/>
+            </properties>
+          </component>
+          <component id="cb567" class="javax.swing.JComboBox" binding="comboBoxStreams">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="3b81f" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Qualität:"/>
+            </properties>
+          </component>
+          <component id="35b31" class="javax.swing.JComboBox" binding="comboBoxQuality">
+            <constraints>
+              <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <minimum-size width="70" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <hspacer id="7926d">
+            <constraints>
+              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+          </hspacer>
+        </children>
+      </grid>
     </children>
   </grid>
 </form>

src/com/ixab/GUI/MainWindow.java

@@ -6,8 +6,10 @@ import com.ixab.ConfigHandling.StreamConfigItem;
 import com.ixab.ConfigHandling.StreamConfigSorter;
 import com.ixab.Logging.Logger;
 import com.ixab.StreamHandling.StreamOpener;
+import com.sun.xml.internal.ws.policy.privateutil.PolicyUtils;
 
 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.*;
 
 public class MainWindow {
@@ -32,6 +34,8 @@ public class MainWindow {
 
     private JLabel errorLabel;
     private JButton buttonReloadStreamData;
+    private JButton vorherigerButton;
+    private JButton nächsterButton;
     private boolean lockStreamInfoGetter = false;
 
     public MainWindow() {
@@ -60,9 +64,7 @@ public class MainWindow {
             public void actionPerformed(ActionEvent e) {
                 ConfigFileInstanceHandler.getConfig().removeStream(comboBoxStreams.getSelectedItem());
                 ConfigFileIOHandler.save(ConfigFileInstanceHandler.getConfig());
-                lockStreamInfoGetter = true;
                 refreshStreamsComboBox();
-                lockStreamInfoGetter = false;
             }
         });
         comboBoxStreams.addActionListener(new ActionListener() {
@@ -71,6 +73,7 @@ public class MainWindow {
                 if (!lockStreamInfoGetter) {
                     updateStreamDetails();
                 }
+                ConfigFileInstanceHandler.getConfig().setLastSelectedStream(comboBoxStreams.getSelectedIndex());
             }
         });
         buttonReloadAllStreamData.addActionListener(new ActionListener() {
@@ -92,6 +95,32 @@ public class MainWindow {
                 updateStreamDetails();
             }
         });
+        nächsterButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (comboBoxStreams.getSelectedIndex()!=ConfigFileInstanceHandler.getConfig().getStreams().size()-1) {
+                    comboBoxStreams.setSelectedIndex(comboBoxStreams.getSelectedIndex() + 1);
+                } else {
+                    comboBoxStreams.setSelectedIndex(0);
+                }
+            }
+        });
+        vorherigerButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (comboBoxStreams.getSelectedIndex()!=0) {
+                    comboBoxStreams.setSelectedIndex(comboBoxStreams.getSelectedIndex() - 1);
+                } else {
+                    comboBoxStreams.setSelectedIndex(ConfigFileInstanceHandler.getConfig().getStreams().size()-1);
+                }
+            }
+        });
+        comboBoxQuality.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                ConfigFileInstanceHandler.getConfig().setLastSelectedQuality(comboBoxQuality.getSelectedIndex());
+            }
+        });
     }
     private void startUpdaterThread() {
         if (updateThread != null) {
@@ -166,23 +195,44 @@ public class MainWindow {
         as.create();
     }
     private void refreshComboBoxes() {
-        lockStreamInfoGetter = true;
         refreshQualityComboBox();
         refreshStreamsComboBox();
-        lockStreamInfoGetter = false;
     }
     protected void refreshStreamsComboBox() {
+        lockStreamInfoGetter = true;
         Object o = comboBoxStreams.getSelectedItem();
         comboBoxStreams.removeAllItems();
         for (StreamConfigItem stream :
                 ConfigFileInstanceHandler.getConfig().getStreams()) {
             comboBoxStreams.addItem(stream);
         }
-        comboBoxStreams.setSelectedItem(o);
+        if (o != null) {
+            comboBoxStreams.setSelectedItem(o);
+        } else if (comboBoxStreams.getItemCount()>0) {
+            if (ConfigFileInstanceHandler.getConfig().getLastSelectedStream() == -1) {
+                comboBoxStreams.setSelectedIndex(0);
+            } else {
+                comboBoxStreams.setSelectedIndex(ConfigFileInstanceHandler.getConfig().getLastSelectedStream());
+            }
+        }
+        if (o == null && comboBoxStreams.getItemCount()>0) {
+            comboBoxStreams.setSelectedIndex(ConfigFileInstanceHandler.getConfig().getLastSelectedStream());
+        }
+        lockStreamInfoGetter = false;
     }
     private void refreshQualityComboBox() {
+        Object o = comboBoxQuality.getSelectedItem();
         comboBoxQuality.removeAllItems();
         comboBoxQuality.addItem("best"); comboBoxQuality.addItem("high"); comboBoxQuality.addItem("medium"); comboBoxQuality.addItem("low"); comboBoxQuality.addItem("mobile");
+        if (o != null) {
+            comboBoxQuality.setSelectedItem(o);
+        }
+        if (ConfigFileInstanceHandler.getConfig().getLastSelectedQuality() == -1) {
+            ConfigFileInstanceHandler.getConfig().setLastSelectedQuality(comboBoxQuality.getSelectedIndex());
+        } else {
+            comboBoxQuality.setSelectedIndex(ConfigFileInstanceHandler.getConfig().getLastSelectedQuality());
+        }
+
     }
     public static void main(String[] args) {
         JFrame frame = new JFrame("jLSLauncher "+ com.ixab.Main.getVersion());
@@ -191,6 +241,7 @@ public class MainWindow {
         frame.pack();
         frame.setLocationByPlatform(true);
         frame.setVisible(true);
-        frame.setResizable(false);
+        frame.setResizable(true);
+        frame.setMinimumSize(new Dimension(680, 440));
     }
 }

src/com/ixab/GUI/SettingsWindow.form

@@ -49,7 +49,7 @@
           </grid>
         </children>
       </grid>
-      <grid id="e3588" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="e3588" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -65,17 +65,17 @@
               <text value="Pfad zu Livestreamer:"/>
             </properties>
           </component>
-          <component id="42a4f" class="javax.swing.JCheckBox" binding="debugmodusCheckBox" default-binding="true">
+          <component id="42a4f" class="javax.swing.JCheckBox" binding="nichtImplementiertCheckBox" default-binding="true">
             <constraints>
-              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value=""/>
+              <text value=" (nicht implementiert)"/>
             </properties>
           </component>
           <component id="e34b3" class="javax.swing.JLabel">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Debugmodus:"/>
@@ -99,7 +99,7 @@
           </component>
           <component id="c3f1e" class="javax.swing.JLabel">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Favoriten Import:"/>
@@ -107,7 +107,7 @@
           </component>
           <component id="3e70" class="javax.swing.JTextField" binding="twitchBenutzernameTextField" default-binding="true">
             <constraints>
-              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -117,12 +117,28 @@
           </component>
           <component id="9749e" class="javax.swing.JButton" binding="buttonImportUserData">
             <constraints>
-              <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Importieren"/>
             </properties>
           </component>
+          <component id="2578" class="javax.swing.JTextField" binding="textFieldProxy">
+            <constraints>
+              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="e33c2" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Proxy (optional):"/>
+            </properties>
+          </component>
         </children>
       </grid>
     </children>

src/com/ixab/GUI/SettingsWindow.java

@@ -11,14 +11,16 @@ public class SettingsWindow extends JDialog {
     private JPanel contentPane;
     private JButton buttonOK;
     private JButton buttonCancel;
-    private JCheckBox debugmodusCheckBox;
+    private JCheckBox nichtImplementiertCheckBox;
     private JTextField textField1;
     private JButton suchenButton;
     private JTextField twitchBenutzernameTextField;
     private JButton buttonImportUserData;
+    private JTextField textFieldProxy;
 
     public SettingsWindow() {
         textField1.setText(ConfigFileInstanceHandler.getConfig().getLSPath());
+        textFieldProxy.setText(ConfigFileInstanceHandler.getConfig().getProxy());
         setContentPane(contentPane);
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
@@ -95,6 +97,7 @@ public class SettingsWindow extends JDialog {
 
     private void onOK() {
         ConfigFileInstanceHandler.getConfig().setLSPath(textField1.getText());
+        ConfigFileInstanceHandler.getConfig().setProxy(textFieldProxy.getText());
         ConfigFileIOHandler.save(ConfigFileInstanceHandler.getConfig());
         dispose();
     }

src/com/ixab/Main.java

@@ -3,12 +3,14 @@ package com.ixab;
 import com.ixab.ConfigHandling.Config;
 import com.ixab.ConfigHandling.ConfigFileIOHandler;
 import com.ixab.ConfigHandling.ConfigFileInstanceHandler;
+import com.ixab.GUI.AlertWindow;
 import com.ixab.GUI.MainWindow;
+import com.ixab.Logging.Logger;
 
 import javax.swing.*;
 
 public class Main {
-    private final static String version = "0.4 Alpha";
+    private final static String version = "0.55 Alpha";
     private static Config c = null;
     public static void main(String[] args) {
         try {
@@ -44,6 +46,7 @@ public class Main {
         jfc.showOpenDialog(jf);
         if (jfc.getSelectedFile() == null) System.exit(-1);
         c.setLSPath(jfc.getSelectedFile().getAbsolutePath());
+        c.setProxy("");
         jf.dispose();
         ConfigFileIOHandler.save(c);
     }

src/com/ixab/StreamHandling/StreamOpener.java

@@ -11,15 +11,28 @@ public class StreamOpener extends Thread {
     private Config c;
     private String streamName;
     private String quality;
+    private String proxy;
+    private String proxyParam;
     public StreamOpener(Config c, int streamIndex, String quality) {
         this.c = c;
         this.streamName = c.getStreamName(streamIndex);
         this.quality = quality;
+        this.proxy = c.getProxy();
     }
     public void run() {
         try {
+            Logger.print("Starting stream livestreamer for "+this.streamName+" at "+this.quality+" quality");
             Runtime rt = Runtime.getRuntime();
-            Process pr = rt.exec(this.c.getLSPath()+" twitch.tv/"+this.streamName+" "+this.quality);
+            // TODO: all this needs clean up
+            if (!this.proxy.equals("")) {
+                StringBuilder sb = new StringBuilder();
+                sb.append(" --http-proxy ");
+                sb.append(this.proxy);
+                this.proxyParam = sb.toString();
+            } else {
+                this.proxyParam = "";
+            }
+            Process pr = rt.exec(this.c.getLSPath()+" twitch.tv/"+this.streamName+" "+this.quality+this.proxyParam);
 
             BufferedReader input = new BufferedReader(new InputStreamReader(pr.getInputStream()));