Skip to content

Commit

Permalink
Fixed missing input dialog for transfer assembly
Browse files Browse the repository at this point in the history
  • Loading branch information
ProgTrade committed May 2, 2015
1 parent 8ccaeb7 commit de4b9f4
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 20 deletions.
13 changes: 7 additions & 6 deletions nUpdate.Administration/UI/Dialogs/NewProjectDialog.Designer.cs
View file

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

19 changes: 19 additions & 0 deletions nUpdate.Administration/UI/Dialogs/NewProjectDialog.cs
View file
Expand Up @@ -27,13 +27,16 @@ public partial class NewProjectDialog : BaseDialog, IAsyncSupportable, IResettab
private bool _allowCancel;
private bool _mustClose;
private bool _generalTabPassed;
private bool _isSetByUser = true;
//private LocalizationProperties _lp = new LocalizationProperties();
private bool _phpFileCreated;
private bool _phpFileUploaded;
private List<ProjectConfiguration> _projectConfiguration;
private bool _projectConfigurationEdited;
private bool _projectFileCreated;
private TabPage _sender;
private int _lastSelectedIndex;
private string _ftpAssemblyPath;
private readonly FtpManager _ftp = new FtpManager();

public NewProjectDialog()
Expand Down Expand Up @@ -254,6 +257,8 @@ private void NewProjectDialog_Load(object sender, EventArgs e)
localPathTextBox.Initialize();
controlPanel1.Visible = false;
GenerateKeyPair();

_isSetByUser = true;
}

private void NewProjectDialog_FormClosing(object sender, FormClosingEventArgs e)
Expand Down Expand Up @@ -481,6 +486,7 @@ private void continueButton_Click(object sender, EventArgs e)
FtpDirectory = ftpDirectoryTextBox.Text,
FtpProtocol = ftpProtocolComboBox.SelectedIndex,
FtpUsePassiveMode = usePassive,
FtpTransferAssemblyFilePath = _ftpAssemblyPath,
Proxy = proxy,
ProxyUsername = proxyUsername,
ProxyPassword = proxyPassword,
Expand Down Expand Up @@ -893,5 +899,18 @@ private void doNotUseProxyRadioButton_CheckedChanged(object sender, EventArgs e)
{
proxyPanel.Enabled = doNotUseProxyRadioButton.Checked;
}

private void ftpProtocolComboBox_SelectedIndexChanged(object sender, EventArgs e)
{
if (!_isSetByUser || (ftpProtocolComboBox.SelectedIndex != ftpProtocolComboBox.Items.Count - 1))
return;
var ftpAssemblyInputDialog = new FtpAssemblyInputDialog();
if (ftpAssemblyInputDialog.ShowDialog() == DialogResult.Cancel)
ftpProtocolComboBox.SelectedIndex = _lastSelectedIndex;
else
_ftpAssemblyPath = ftpAssemblyInputDialog.AssemblyPath;

_lastSelectedIndex = ftpProtocolComboBox.SelectedIndex;
}
}
}
26 changes: 13 additions & 13 deletions nUpdate.Administration/UI/Dialogs/NewProjectDialog.resx
View file
Expand Up @@ -217,7 +217,7 @@
<value>controlPanel1</value>
</data>
<data name="&gt;&gt;controlPanel1.Type" xml:space="preserve">
<value>nUpdate.UI.Controls.BottomPanel, nUpdate, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.UI.Controls.BottomPanel, nUpdate, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;controlPanel1.Parent" xml:space="preserve">
<value>$this</value>
Expand Down Expand Up @@ -768,7 +768,7 @@ Please be patient.</value>
<value>updateUrlTextBox</value>
</data>
<data name="&gt;&gt;updateUrlTextBox.Type" xml:space="preserve">
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;updateUrlTextBox.Parent" xml:space="preserve">
<value>generalPanel</value>
Expand Down Expand Up @@ -822,7 +822,7 @@ Please be patient.</value>
<value>nameTextBox</value>
</data>
<data name="&gt;&gt;nameTextBox.Type" xml:space="preserve">
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;nameTextBox.Parent" xml:space="preserve">
<value>generalPanel</value>
Expand Down Expand Up @@ -912,7 +912,7 @@ Please be patient.</value>
<value>localPathTextBox</value>
</data>
<data name="&gt;&gt;localPathTextBox.Type" xml:space="preserve">
<value>nUpdate.Administration.UI.Controls.ButtonTextBox, nUpdate Administration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.Administration.UI.Controls.ButtonTextBox, nUpdate Administration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;localPathTextBox.Parent" xml:space="preserve">
<value>generalPanel</value>
Expand Down Expand Up @@ -1087,7 +1087,7 @@ Please be patient.</value>
<value>line1</value>
</data>
<data name="&gt;&gt;line1.Type" xml:space="preserve">
<value>nUpdate.UI.Controls.Line, nUpdate, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.UI.Controls.Line, nUpdate, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;line1.Parent" xml:space="preserve">
<value>ftpPanel</value>
Expand Down Expand Up @@ -1306,7 +1306,7 @@ Please be patient.</value>
<value>ftpPortTextBox</value>
</data>
<data name="&gt;&gt;ftpPortTextBox.Type" xml:space="preserve">
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ftpPortTextBox.Parent" xml:space="preserve">
<value>ftpPanel</value>
Expand All @@ -1330,7 +1330,7 @@ Please be patient.</value>
<value>ftpUserTextBox</value>
</data>
<data name="&gt;&gt;ftpUserTextBox.Type" xml:space="preserve">
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ftpUserTextBox.Parent" xml:space="preserve">
<value>ftpPanel</value>
Expand All @@ -1354,7 +1354,7 @@ Please be patient.</value>
<value>ftpHostTextBox</value>
</data>
<data name="&gt;&gt;ftpHostTextBox.Type" xml:space="preserve">
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ftpHostTextBox.Parent" xml:space="preserve">
<value>ftpPanel</value>
Expand Down Expand Up @@ -1600,7 +1600,7 @@ Please be patient.</value>
<value>line2</value>
</data>
<data name="&gt;&gt;line2.Type" xml:space="preserve">
<value>nUpdate.UI.Controls.Line, nUpdate, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.UI.Controls.Line, nUpdate, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;line2.Parent" xml:space="preserve">
<value>statisticsServerTabPage</value>
Expand Down Expand Up @@ -2054,7 +2054,7 @@ can configurate a statistics server here. All you need for it is PHP and a MySQL
<value>proxyUserTextBox</value>
</data>
<data name="&gt;&gt;proxyUserTextBox.Type" xml:space="preserve">
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;proxyUserTextBox.Parent" xml:space="preserve">
<value>proxyPanel</value>
Expand Down Expand Up @@ -2189,7 +2189,7 @@ can configurate a statistics server here. All you need for it is PHP and a MySQL
<value>proxyHostTextBox</value>
</data>
<data name="&gt;&gt;proxyHostTextBox.Type" xml:space="preserve">
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.Administration.UI.Controls.CueTextBox, nUpdate Administration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;proxyHostTextBox.Parent" xml:space="preserve">
<value>proxyPanel</value>
Expand Down Expand Up @@ -2261,7 +2261,7 @@ can configurate a statistics server here. All you need for it is PHP and a MySQL
<value>informationCategoriesTabControl</value>
</data>
<data name="&gt;&gt;informationCategoriesTabControl.Type" xml:space="preserve">
<value>nUpdate.Administration.UI.Controls.TablessTabControl, nUpdate Administration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.Administration.UI.Controls.TablessTabControl, nUpdate Administration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;informationCategoriesTabControl.Parent" xml:space="preserve">
<value>$this</value>
Expand Down Expand Up @@ -3228,6 +3228,6 @@ can configurate a statistics server here. All you need for it is PHP and a MySQL
<value>NewProjectDialog</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>nUpdate.Administration.UI.Dialogs.BaseDialog, nUpdate Administration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>nUpdate.Administration.UI.Dialogs.BaseDialog, nUpdate Administration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>
2 changes: 1 addition & 1 deletion nUpdate.Administration/UI/Dialogs/ProjectEditDialog.cs
View file
Expand Up @@ -881,7 +881,7 @@ private void continueButton_Click(object sender, EventArgs e)
_ftp.Password = ftpPassword;

_ftp.UsePassiveMode = ftpModeComboBox.SelectedIndex == 0;
_ftp.Protocol = (FtpSecurityProtocol) ftpProtocolComboBox.SelectedIndex;
_ftp.Protocol = (FtpSecurityProtocol)ftpProtocolComboBox.SelectedIndex;

if (!backButton.Enabled) // If the back-button was disabled, enable it again
backButton.Enabled = true;
Expand Down

0 comments on commit de4b9f4

Please sign in to comment.