Skip to content

Commit

Permalink
📂 v2.2.4
Browse files Browse the repository at this point in the history
Added:
- Settings -> Windows: Open with QuickPictureViewer (#23, #2)
- Settings -> Windows: Browse folder with QuickPictureViewer (#23, #2)

Changes:
- QuickLibrary v2.2.4
  • Loading branch information
Beelink committed Oct 25, 2020
1 parent fa59ab9 commit 8dc33e4
Show file tree
Hide file tree
Showing 50 changed files with 130 additions and 75 deletions.
Binary file modified .vs/quick-picture-viewer/v16/.suo
Binary file not shown.
Binary file modified .vs/quick-picture-viewer/v16/Server/sqlite3/storage.ide
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified inno-setup/QuickPictureViewer-Setup.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion inno-setup/quick-picture-viewer.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Quick Picture Viewer"
#define MyAppVersion "2.2.3"
#define MyAppVersion "2.2.4"
#define MyAppPublisher "Module Art"
#define MyAppURL "https://moduleart.github.io"
#define MyAppExeName "quick-picture-viewer.exe"
Expand Down
2 changes: 0 additions & 2 deletions quick-picture-viewer/PrintForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions quick-picture-viewer/PrintForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ private void SetDarkMode(bool dark)
}

DarkMode = dark;
marginsCheckBox.SetDarkMode(dark);
horizontalCheckBox.SetDarkMode(dark);
centerCheckbox.SetDarkMode(dark);
marginsCheckBox.DarkMode = dark;
horizontalCheckBox.DarkMode = dark;
centerCheckbox.DarkMode = dark;
closeBtn.SetDarkMode(dark);
rightMarginTextBox.DarkMode = dark;
leftMarginTextBox.DarkMode = dark;
Expand Down
13 changes: 12 additions & 1 deletion quick-picture-viewer/SettingsForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

104 changes: 80 additions & 24 deletions quick-picture-viewer/SettingsForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ private struct Language
}
};

private bool betaLangWarning = false;
private bool settingsStarted = false;
private MainForm owner;

public SettingsForm(bool darkMode)
{
if (darkMode)
{
this.HandleCreated += new EventHandler(ThemeManager.formHandleCreated);
HandleCreated += new EventHandler(ThemeManager.formHandleCreated);
}

InitializeComponent();
Expand Down Expand Up @@ -89,12 +89,7 @@ public SettingsForm(bool darkMode)

favExtTextBox.Text = Properties.Settings.Default.FavoriteExternalApp;

const string openWithKey = "HKEY_CLASSES_ROOT\\*\\shell\\QuickPictureViewer";
string openWithValue = (string)Registry.GetValue(openWithKey, string.Empty, string.Empty);
if (openWithValue.Length > 0)
{
openWithCheckBox.Checked = true;
}
openWithCheckBox.Checked = GetOpenWithState();
const string browseWithKey1 = "HKEY_CLASSES_ROOT\\Directory\\Background\\shell\\QuickPictureViewer";
const string browseWithKey2 = "HKEY_CLASSES_ROOT\\Directory\\shell\\QuickPictureViewer";
string browseWithValue1 = (string)Registry.GetValue(browseWithKey1, string.Empty, string.Empty);
Expand Down Expand Up @@ -124,7 +119,7 @@ public SettingsForm(bool darkMode)

private void InitLanguage()
{
this.Text = owner.resMan.GetString("settings");
Text = owner.resMan.GetString("settings");
langPage.Text = owner.resMan.GetString("localization");
startupPage.Text = owner.resMan.GetString("startup");
restartLabel1.Text = "* " + owner.resMan.GetString("restart-required");
Expand All @@ -140,7 +135,6 @@ private void InitLanguage()
updatesCheckBox.Text = owner.resMan.GetString("check-for-app-updates");
favExtLabel.Text = owner.resMan.GetString("fav-external-app") + ":";
browseBtn.Text = " " + owner.resMan.GetString("browse");
externalPage.Text = owner.resMan.GetString("windows");
slideshowPage.Text = owner.resMan.GetString("slideshow");
slideshowTimeLabel.Text = owner.resMan.GetString("switching-time") + ":";
mousePage.Text = owner.resMan.GetString("input");
Expand Down Expand Up @@ -175,32 +169,32 @@ private void SetDarkMode(bool dark)
}

DarkMode = dark;
updatesCheckBox.SetDarkMode(dark);
fullscrCursorCheckBox.SetDarkMode(dark);
updatesCheckBox.DarkMode = dark;
fullscrCursorCheckBox.DarkMode = dark;
darkThemeRadio.SetDarkMode(dark);
lightThemeRadio.SetDarkMode(dark);
systemThemeRadio.SetDarkMode(dark);
closeBtn.SetDarkMode(dark);
slideshowTimeNumeric.DarkMode = dark;
slideshowCounterCheckBox.SetDarkMode(dark);
slideshowCounterCheckBox.DarkMode = dark;
langComboBox.SetDarkMode(dark);
favExtTextBox.DarkMode = dark;
escToExitCheckBox.SetDarkMode(dark);
escToExitCheckBox.DarkMode = dark;
mouseWheelActionRadio1.SetDarkMode(dark);
mouseWheelActionRadio2.SetDarkMode(dark);
mouseWheelActionRadio3.SetDarkMode(dark);
startupMaximizeCheckBox.SetDarkMode(dark);
startupPasteCheckBox.SetDarkMode(dark);
startupBoundsCheckBox.SetDarkMode(dark);
openWithCheckBox.SetDarkMode(dark);
browseWithCheckBox.SetDarkMode(dark);
startupMaximizeCheckBox.DarkMode = dark;
startupPasteCheckBox.DarkMode = dark;
startupBoundsCheckBox.DarkMode = dark;
openWithCheckBox.DarkMode = dark;
browseWithCheckBox.DarkMode = dark;
}

private void SettingsForm_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Escape)
{
this.Close();
Close();
}
}

Expand Down Expand Up @@ -245,7 +239,7 @@ private void fullscrCursorCheckBox_CheckedChanged(object sender, EventArgs e)

private void closeBtn_Click(object sender, EventArgs e)
{
this.Close();
Close();
}

private void favExtTextBox_TextChanged(object sender, EventArgs e)
Expand Down Expand Up @@ -282,7 +276,7 @@ private void langComboBox_SelectedIndexChanged(object sender, EventArgs e)

if (owner != null)
{
if (languages[langComboBox.SelectedIndex].Beta && betaLangWarning)
if (languages[langComboBox.SelectedIndex].Beta && settingsStarted)
{
MessageBox.Show(
owner.resMan.GetString("beta-lang-warning"),
Expand Down Expand Up @@ -318,10 +312,10 @@ private void Ll_Click(object sender, EventArgs e)

private void SettingsForm_Load(object sender, EventArgs e)
{
owner = this.Owner as MainForm;
owner = Owner as MainForm;
InitLanguage();
langComboBox_SelectedIndexChanged(null, null);
betaLangWarning = true;
settingsStarted = true;
}

private void escToExitCheckBox_CheckedChanged(object sender, EventArgs e)
Expand Down Expand Up @@ -370,5 +364,67 @@ private void startupBoundsCheckBox_CheckedChanged(object sender, EventArgs e)
Properties.Settings.Default.StartupRestoreBounds = startupBoundsCheckBox.Checked;
Properties.Settings.Default.Save();
}

private void openWithCheckBox_CheckedChanged(object sender, EventArgs e)
{
if (settingsStarted)
{
try
{
if (openWithCheckBox.Checked)
{
Registry.SetValue("HKEY_CLASSES_ROOT\\*\\shell\\QuickPictureViewer", "", "Open with QuickPictureViewer");
Registry.SetValue("HKEY_CLASSES_ROOT\\*\\shell\\QuickPictureViewer", "Icon", string.Format("\"{0}picture.ico\"", AppDomain.CurrentDomain.BaseDirectory));
Registry.SetValue("HKEY_CLASSES_ROOT\\*\\shell\\QuickPictureViewer\\command", "", string.Format("\"{0}quick-picture-viewer.exe\" \"%V\"", AppDomain.CurrentDomain.BaseDirectory));
}
else
{
RegistryKey RegKey = Registry.ClassesRoot.OpenSubKey("*\\shell\\QuickPictureViewer", true);
RegKey.DeleteSubKeyTree("");
}
}
catch
{
MessageBox.Show("To change context menu options you need to run app with Administrator", owner.resMan.GetString("error"));
}
}
}

private void browseWithCheckBox_CheckedChanged(object sender, EventArgs e)
{
if (settingsStarted)
{
try
{
if (browseWithCheckBox.Checked)
{
Registry.SetValue("HKEY_CLASSES_ROOT\\Directory\\Background\\shell\\QuickPictureViewer", "", "Browse folder with QuickPictureViewer");
Registry.SetValue("HKEY_CLASSES_ROOT\\Directory\\Background\\shell\\QuickPictureViewer", "Icon", string.Format("\"{0}picture.ico\"", AppDomain.CurrentDomain.BaseDirectory));
Registry.SetValue("HKEY_CLASSES_ROOT\\Directory\\Background\\shell\\QuickPictureViewer\\command", "", string.Format("\"{0}quick-picture-viewer.exe\" \"%V\"", AppDomain.CurrentDomain.BaseDirectory));

Registry.SetValue("HKEY_CLASSES_ROOT\\Directory\\shell\\QuickPictureViewer", "", "Browse folder with QuickPictureViewer");
Registry.SetValue("HKEY_CLASSES_ROOT\\Directory\\shell\\QuickPictureViewer", "Icon", string.Format("\"{0}picture.ico\"", AppDomain.CurrentDomain.BaseDirectory));
Registry.SetValue("HKEY_CLASSES_ROOT\\Directory\\shell\\QuickPictureViewer\\command", "", string.Format("\"{0}quick-picture-viewer.exe\" \"%V\"", AppDomain.CurrentDomain.BaseDirectory));
}
else
{
RegistryKey RegKey = Registry.ClassesRoot.OpenSubKey("Directory\\Background\\shell\\QuickPictureViewer", true);
RegKey.DeleteSubKeyTree("");
RegistryKey RegKey2 = Registry.ClassesRoot.OpenSubKey("Directory\\shell\\QuickPictureViewer", true);
RegKey2.DeleteSubKeyTree("");
}
}
catch
{
MessageBox.Show("To change context menu options you need to run app with Administrator", owner.resMan.GetString("error"));
}
}
}

private bool GetOpenWithState()
{
string openWithValue = (string)Registry.GetValue("HKEY_CLASSES_ROOT\\*\\shell\\QuickPictureViewer", string.Empty, string.Empty);
return openWithValue.Length > 0;
}
}
}
1 change: 0 additions & 1 deletion quick-picture-viewer/SvgOpsForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion quick-picture-viewer/SvgOpsForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private void SetDarkMode(bool dark)
DarkMode = dark;
widthNumeric.DarkMode = dark;
heightNumeric.DarkMode = dark;
aspectRatioCheckbox.SetDarkMode(dark);
aspectRatioCheckbox.DarkMode = dark;
closeBtn.SetDarkMode(dark);
}

Expand Down
Binary file modified quick-picture-viewer/bin/Debug/QuickLibrary.dll
Binary file not shown.
Binary file modified quick-picture-viewer/bin/Debug/QuickLibrary.pdb
Binary file not shown.
4 changes: 0 additions & 4 deletions quick-picture-viewer/bin/Debug/languages/lang_en.resx
Original file line number Diff line number Diff line change
Expand Up @@ -805,10 +805,6 @@
<value>Width</value>
<comment>SVG options</comment>
</data>
<data name="windows" xml:space="preserve">
<value>Windows</value>
<comment>Settings</comment>
</data>
<data name="zoom" xml:space="preserve">
<value>Zoom</value>
<comment>Status bar</comment>
Expand Down
4 changes: 0 additions & 4 deletions quick-picture-viewer/bin/Debug/languages/lang_ru.resx
Original file line number Diff line number Diff line change
Expand Up @@ -805,10 +805,6 @@
<value>Ширина</value>
<comment>SVG options</comment>
</data>
<data name="windows" xml:space="preserve">
<value>Windows</value>
<comment>Settings</comment>
</data>
<data name="zoom" xml:space="preserve">
<value>Масштаб</value>
<comment>Status bar</comment>
Expand Down
Binary file modified quick-picture-viewer/bin/Debug/quick-picture-viewer.exe
Binary file not shown.
Binary file modified quick-picture-viewer/bin/Debug/quick-picture-viewer.pdb
Binary file not shown.
Binary file modified quick-picture-viewer/bin/Release/QuickLibrary.dll
Binary file not shown.
Binary file modified quick-picture-viewer/bin/Release/QuickLibrary.pdb
Binary file not shown.
Loading

0 comments on commit 8dc33e4

Please sign in to comment.