Added a screenshot to the readme - Tweaked some bits of the UI

jakenvac · Aug 25, 2016 · 40e9d93 · 40e9d93
1 parent ac28ab0
commit 40e9d93
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 61 deletions.
diff --git a/NitroStream-Gtk/NitroStream-GTK.csproj b/NitroStream-Gtk/NitroStream-GTK.csproj
@@ -73,7 +73,7 @@
     <EmbeddedResource Include="gtk-gui\gui.stetic">
       <LogicalName>gui.stetic</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\..\NitroStream\Nitro Stream\Resources\icon.ico" />
+    <EmbeddedResource Include="icon.ico" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="gtk-gui\generated.cs" />
@@ -89,12 +89,6 @@
   <ItemGroup>
     <Folder Include="Resources\" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\libNitroStream\libNitroStream.csproj">
-      <Project>{DF2DEBD8-BFE9-4D73-A10A-835B9D0D41D9}</Project>
-      <Name>libNitroStream</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>
@@ -105,4 +99,10 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
+  <ItemGroup>
+    <ProjectReference Include="..\..\libNitroStream\libNitroStream\libNitroStream.csproj">
+      <Project>{DF2DEBD8-BFE9-4D73-A10A-835B9D0D41D9}</Project>
+      <Name>libNitroStream</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
diff --git a/NitroStream-Gtk/View/MainWindow.cs b/NitroStream-Gtk/View/MainWindow.cs
@@ -24,7 +24,6 @@ public string logText
 		public MainWindow(object dc) : base (Gtk.WindowType.Toplevel)
 		{
 			DataContext = dc;
-//            Menu.
 			Build();
 		}
 
@@ -67,7 +66,7 @@ public void Populate ()
 			}
 		}
 
-		protected void ConnectButtonPressed (object sender, EventArgs e)
+		protected void onConnectButtonClicked (object sender, EventArgs e)
 		{
 			ViewModel vm = this.DataContext as ViewModel;
 			if (vm != null) {
@@ -126,16 +125,6 @@ protected override void OnShown ()
 			base.OnShown ();
 		}
 
-		protected void onWindowRealized (object sender, EventArgs e)
-		{
-			CheckUpdate();
-		}
-
-		protected void onWindowShown (object sender, EventArgs e)
-		{
-			CheckUpdate();
-		}
-
         protected void onUpdateButtonPress(object sender, EventArgs e)
         {
             ViewModel vm = DataContext as ViewModel;
@@ -153,12 +142,6 @@ protected void onSendMemoryPatch(object sender, EventArgs e)
                 vm.InitiateConnection(libNitroStream.ClientManager.ConnectionIntents.MemoryPatch);
             }
         }
-
-        protected void onShowLogToggled(object sender, EventArgs e)
-        {
-            throw new NotImplementedException();
-        }
-
 	}
 
 }
diff --git a/NitroStream-Gtk/gtk-gui/NitroStreamGtk.View.MainWindow.cs b/NitroStream-Gtk/gtk-gui/NitroStreamGtk.View.MainWindow.cs
@@ -12,8 +12,6 @@ public partial class MainWindow
 
 		private global::Gtk.Action openAction;
 
-		private global::Gtk.ToggleAction justifyFillAction;
-
 		private global::Gtk.Action CreditsAction;
 
 		private global::Gtk.VBox vbox2;
@@ -72,7 +70,7 @@ public partial class MainWindow
 
 		private global::Gtk.TextView txtLog;
 
-		private global::Gtk.Button button3;
+		private global::Gtk.Button button1;
 
 		private global::Gtk.Button button2;
 
@@ -91,9 +89,6 @@ protected virtual void Build ()
 			this.openAction = new global::Gtk.Action ("openAction", global::Mono.Unix.Catalog.GetString ("Define NTRViewer path"), null, "gtk-open");
 			this.openAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Define NTRViewer path");
 			w1.Add (this.openAction, null);
-			this.justifyFillAction = new global::Gtk.ToggleAction ("justifyFillAction", global::Mono.Unix.Catalog.GetString ("Show log"), null, "gtk-justify-fill");
-			this.justifyFillAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Show log");
-			w1.Add (this.justifyFillAction, null);
 			this.CreditsAction = new global::Gtk.Action ("CreditsAction", global::Mono.Unix.Catalog.GetString ("Credits"), null, null);
 			this.CreditsAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Credits");
 			w1.Add (this.CreditsAction, null);
@@ -110,7 +105,7 @@ protected virtual void Build ()
 			this.vbox2.Name = "vbox2";
 			this.vbox2.Spacing = 6;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.UIManager.AddUiFromString ("<ui><menubar name='Menu'><menu name='ConfigAction' action='ConfigAction'><menuitem name='openAction' action='openAction'/><menuitem name='justifyFillAction' action='justifyFillAction'/></menu><menu name='AboutAction' action='AboutAction'><menuitem name='CreditsAction' action='CreditsAction'/></menu></menubar></ui>");
+			this.UIManager.AddUiFromString ("<ui><menubar name='Menu'><menu name='ConfigAction' action='ConfigAction'><menuitem name='openAction' action='openAction'/></menu><menu name='AboutAction' action='AboutAction'><menuitem name='CreditsAction' action='CreditsAction'/></menu></menubar></ui>");
 			this.Menu = ((global::Gtk.MenuBar)(this.UIManager.GetWidget ("/Menu")));
 			this.Menu.Name = "Menu";
 			this.vbox2.Add (this.Menu);
@@ -395,14 +390,13 @@ protected virtual void Build ()
 			w27.PackType = ((global::Gtk.PackType)(1));
 			w27.Position = 4;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.button3 = new global::Gtk.Button ();
-			this.button3.CanFocus = true;
-			this.button3.Name = "button3";
-			this.button3.UseUnderline = true;
-			this.button3.BorderWidth = ((uint)(3));
-			this.button3.Label = global::Mono.Unix.Catalog.GetString ("Connect");
-			this.vbox2.Add (this.button3);
-			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.button3]));
+			this.button1 = new global::Gtk.Button ();
+			this.button1.CanFocus = true;
+			this.button1.Name = "button1";
+			this.button1.UseUnderline = true;
+			this.button1.Label = global::Mono.Unix.Catalog.GetString ("Connect");
+			this.vbox2.Add (this.button1);
+			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.button1]));
 			w28.PackType = ((global::Gtk.PackType)(1));
 			w28.Position = 5;
 			w28.Expand = false;
@@ -426,17 +420,13 @@ protected virtual void Build ()
 			}
 			this.DefaultWidth = 972;
 			this.DefaultHeight = 1004;
-			this.logScroller.Hide ();
 			this.Show ();
 			this.DeleteEvent += new global::Gtk.DeleteEventHandler (this.OnDeleteEvent);
-			this.Realized += new global::System.EventHandler (this.onWindowRealized);
-			this.Shown += new global::System.EventHandler (this.onWindowShown);
 			this.openAction.Activated += new global::System.EventHandler (this.DefineViewrPath);
-			this.justifyFillAction.Toggled += new global::System.EventHandler (this.onShowLogToggled);
 			this.btnUpdate.Pressed += new global::System.EventHandler (this.onUpdateButtonPress);
 			this.button10.Pressed += new global::System.EventHandler (this.onDonateClick);
 			this.button2.Pressed += new global::System.EventHandler (this.onSendMemoryPatch);
-			this.button3.Pressed += new global::System.EventHandler (this.ConnectButtonPressed);
+			this.button1.Pressed += new global::System.EventHandler (this.onConnectButtonClicked);
 		}
 	}
 }
diff --git a/NitroStream-Gtk/gtk-gui/gui.stetic b/NitroStream-Gtk/gtk-gui/gui.stetic
@@ -27,15 +27,6 @@
         <property name="StockId">gtk-open</property>
         <signal name="Activated" handler="DefineViewrPath" />
       </action>
-      <action id="justifyFillAction">
-        <property name="Type">Toggle</property>
-        <property name="Label" translatable="yes">Show log</property>
-        <property name="ShortLabel" translatable="yes">Show log</property>
-        <property name="StockId">gtk-justify-fill</property>
-        <property name="DrawAsRadio">False</property>
-        <property name="Active">False</property>
-        <signal name="Toggled" handler="onShowLogToggled" />
-      </action>
       <action id="CreditsAction">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">Credits</property>
@@ -48,8 +39,6 @@
     <property name="WindowPosition">CenterOnParent</property>
     <property name="Resizable">False</property>
     <signal name="DeleteEvent" handler="OnDeleteEvent" />
-    <signal name="Realized" handler="onWindowRealized" />
-    <signal name="Shown" handler="onWindowShown" />
     <child>
       <widget class="Gtk.VBox" id="vbox2">
         <property name="MemberName" />
@@ -61,7 +50,6 @@
             <node name="Menu" type="Menubar">
               <node type="Menu" action="ConfigAction">
                 <node type="Menuitem" action="openAction" />
-                <node type="Menuitem" action="justifyFillAction" />
               </node>
               <node type="Menu" action="AboutAction">
                 <node type="Menuitem" action="CreditsAction" />
@@ -519,7 +507,6 @@ Bottom</property>
           <widget class="Gtk.ScrolledWindow" id="logScroller">
             <property name="MemberName" />
             <property name="HeightRequest">200</property>
-            <property name="Visible">False</property>
             <property name="ShadowType">In</property>
             <property name="BorderWidth">6</property>
             <child>
@@ -539,14 +526,13 @@ Bottom</property>
           </packing>
         </child>
         <child>
-          <widget class="Gtk.Button" id="button3">
+          <widget class="Gtk.Button" id="button1">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
             <property name="Type">TextOnly</property>
             <property name="Label" translatable="yes">Connect</property>
             <property name="UseUnderline">True</property>
-            <property name="BorderWidth">3</property>
-            <signal name="Pressed" handler="ConnectButtonPressed" />
+            <signal name="Pressed" handler="onConnectButtonClicked" />
           </widget>
           <packing>
             <property name="PackType">End</property>

diff --git a/NitroStream-Gtk/icon.ico b/NitroStream-Gtk/icon.ico
diff --git a/README.md b/README.md
@@ -5,6 +5,8 @@ Currently in an alpha phase. **should** match the Windows/WPF version for featur
 >Allows the user to easily initiate a connection to NTRViewer for NTR CFW on the Nintendo 3DS
 Built on the NTRDebugger by Cell99 - https://github.com/44670/NTRClient
 
+![NitroStream Gtk# Image](https://i.imgur.com/mCZFZdq.png)
+
 ## Dependencies
 You will need:
 * NTRViewer - which can be found in the starter pack here: