added default slider values

4 files changed, 38 insertions, 9 deletions

diff --git a/aoapplication.h b/aoapplication.h
index 34e17915..fc42fe76 100644
--- a/aoapplication.h
+++ b/aoapplication.h
@@ -99,6 +99,10 @@ public:
   QString read_config(QString searchline);
   QString read_user_theme();
   int read_blip_rate();
+  bool get_blank_blip();
+  int get_default_music();
+  int get_default_sfx();
+  int get_default_blip();
   void write_to_serverlist_txt(QString p_line);
   QVector<server_type> read_serverlist_txt();
   pos_size_type get_element_dimensions(QString p_identifier, QString p_file);
@@ -120,7 +124,7 @@ public:
   int get_emote_mod(QString p_char, int p_emote);
   QString get_gender(QString p_char);
   QString read_design_ini(QString p_identifier, QString p_design_path);
-  bool get_blank_blip();
+
 
 
 private:
diff --git a/courtroom.cpp b/courtroom.cpp
index f70db1c6..5806c69c 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -169,15 +169,15 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
 
   ui_music_slider = new QSlider(Qt::Horizontal, this);
   ui_music_slider->setRange(0, 100);
-  ui_music_slider->setValue(50);
+  ui_music_slider->setValue(ao_app->get_default_music());
 
   ui_sfx_slider = new QSlider(Qt::Horizontal, this);
   ui_sfx_slider->setRange(0, 100);
-  ui_sfx_slider->setValue(50);
+  ui_sfx_slider->setValue(ao_app->get_default_sfx());
 
   ui_blip_slider = new QSlider(Qt::Horizontal, this);
   ui_blip_slider->setRange(0, 100);
-  ui_blip_slider->setValue(50);
+  ui_blip_slider->setValue(ao_app->get_default_blip());
 
   ui_evidence_button = new AOButton(this, ao_app);
 
@@ -468,10 +468,10 @@ void Courtroom::set_widgets()
   //emote buttons
 
   set_size_and_pos(ui_defense_bar, "defense_bar");
-  ui_defense_bar->set_image("defensebar10.png");
+  ui_defense_bar->set_image("defensebar" + QString::number(defense_bar_state) + ".png");
 
   set_size_and_pos(ui_prosecution_bar, "prosecution_bar");
-  ui_prosecution_bar->set_image("prosecutionbar10.png");
+  ui_prosecution_bar->set_image("prosecutionbar" + QString::number(prosecution_bar_state) + ".png");
 
   set_size_and_pos(ui_music_label, "music_label");
   ui_music_label->setText("Music");
diff --git a/lobby.cpp b/lobby.cpp
index 5f9f7b17..b5b51667 100644
--- a/lobby.cpp
+++ b/lobby.cpp
@@ -217,8 +217,6 @@ void Lobby::on_add_to_fav_pressed()
 
 void Lobby::on_add_to_fav_released()
 {
-  ao_app->server_packet_received(new AOPacket("AO2CHECK#2.1.1#%"));
-
   ui_add_to_fav->set_image("addtofav.png");
 
   //you cant add favorites from favorites m8
diff --git a/text_file_functions.cpp b/text_file_functions.cpp
index 4dfda51f..bf19232f 100644
--- a/text_file_functions.cpp
+++ b/text_file_functions.cpp
@@ -62,6 +62,33 @@ int AOApplication::read_blip_rate()
     return result.toInt();
 }
 
+int AOApplication::get_default_music()
+{
+  QString f_result = read_config("default_music");
+
+  if (f_result == "")
+    return 50;
+  else return f_result.toInt();
+}
+
+int AOApplication::get_default_sfx()
+{
+  QString f_result = read_config("default_sfx");
+
+  if (f_result == "")
+    return 50;
+  else return f_result.toInt();
+}
+
+int AOApplication::get_default_blip()
+{
+  QString f_result = read_config("default_blip");
+
+  if (f_result == "")
+    return 50;
+  else return f_result.toInt();
+}
+
 void AOApplication::write_to_serverlist_txt(QString p_line)
 {
   QFile serverlist_txt;
@@ -76,7 +103,7 @@ void AOApplication::write_to_serverlist_txt(QString p_line)
 
   QTextStream out(&serverlist_txt);
 
-  out << p_line << '\n';
+  out << p_line << "\r\n";
 
   serverlist_txt.close();
 }