Skip to content

Commit

Permalink
Version increment
Browse files Browse the repository at this point in the history
  • Loading branch information
Jojatekok committed Apr 7, 2015
1 parent 05a51eb commit d3fb69c
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Source/MoneroGui.Net.Desktop/Properties/AssemblyInfo.cs
Expand Up @@ -17,7 +17,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("1.1.0")]
[assembly: AssemblyVersion("1.2.0")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down
39 changes: 20 additions & 19 deletions Source/MoneroGui.Net.Desktop/Windows/MainForm.cs
Expand Up @@ -254,6 +254,16 @@ public void RenderMenu()
Image = Utilities.LoadImage("Information"),
};

var menuFile = new ButtonMenuItem {
Text = Desktop.Properties.Resources.MenuFile,
Items = {
commandAccountBackupManager,
CommandExport,
new SeparatorMenuItem(),
commandExit
}
};

MenuSettings = new ButtonMenuItem {
Text = Desktop.Properties.Resources.MenuSettings,
Items = {
Expand All @@ -263,28 +273,19 @@ public void RenderMenu()
}
};

Menu = new MenuBar {
var menuHelp = new ButtonMenuItem {
Text = Desktop.Properties.Resources.MenuHelp,
Items = {
new ButtonMenuItem {
Text = Desktop.Properties.Resources.MenuFile,
Items = {
commandAccountBackupManager,
CommandExport,
new SeparatorMenuItem(),
commandExit
}
},

MenuSettings,

new ButtonMenuItem {
Text = Desktop.Properties.Resources.MenuHelp,
Items = {
commandShowWindowAbout
}
}
commandShowWindowAbout
}
};

Menu = new MenuBar();
var menuItems = Menu.Items;

menuItems.Add(menuFile);
menuItems.Add(MenuSettings);
menuItems.Add(menuHelp);
}

void RenderContent()
Expand Down
10 changes: 5 additions & 5 deletions Source/MoneroGui.Net.Desktop/app.manifest
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<assemblyIdentity version="1.1.0.0" name="Jojatekok.MoneroGUI.Desktop"/>
<assemblyIdentity version="1.2.0.0" name="Jojatekok.MoneroGUI.Desktop"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
Expand All @@ -27,16 +27,16 @@
Windows will automatically select the most compatible environment.-->

<!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node-->
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />

<!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />

<!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node-->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />

<!-- If your application is designed to work with Windows 8.1, uncomment the following supportedOS node-->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
</application>
</compatibility>

Expand Down

0 comments on commit d3fb69c

Please sign in to comment.