diff --git a/.gitignore b/.gitignore
index 71d741a..e013abd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,218 +1,218 @@
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-
-#################
-## Visual Studio
-#################
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-*/.vs/
-
-# Build results
-
-[Dd]ebug/
-[Rr]elease/
-x64/
-build/
-[Bb]in/
-[Oo]bj/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.log
-*.scc
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.Publish.xml
-*.pubxml
-*.publishproj
-
-# NuGet Packages Directory
-## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
-
-# Windows Azure Build Output
-csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.[Pp]ublish.xml
-*.pfx
-*.publishsettings
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-App_Data/*.mdf
-App_Data/*.ldf
-
-#############
-## Windows detritus
-#############
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Mac crap
-.DS_Store
-
-
-#############
-## Python
-#############
-
-*.py[cod]
-
-# Packages
-*.egg
-*.egg-info
-dist/
-build/
-eggs/
-parts/
-var/
-sdist/
-develop-eggs/
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+*/.vs/
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+*.publishproj
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[cod]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
diff --git a/Handwriting program/Handwriting program/bin/Debug/Handwriting program.dll b/Handwriting program/Handwriting program/bin/Debug/Handwriting program.dll
index c4ae40c..dece495 100644
Binary files a/Handwriting program/Handwriting program/bin/Debug/Handwriting program.dll and b/Handwriting program/Handwriting program/bin/Debug/Handwriting program.dll differ
diff --git a/Handwriting program/Handwriting program/bin/Debug/Handwriting program.pdb b/Handwriting program/Handwriting program/bin/Debug/Handwriting program.pdb
index 3fcee46..bb344b7 100644
Binary files a/Handwriting program/Handwriting program/bin/Debug/Handwriting program.pdb and b/Handwriting program/Handwriting program/bin/Debug/Handwriting program.pdb differ
diff --git a/Handwriting program/Handwriting program/obj/Debug/Handwriting program.csproj.FileListAbsolute.txt b/Handwriting program/Handwriting program/obj/Debug/Handwriting program.csproj.FileListAbsolute.txt
index 5fb5c66..c06f0d8 100644
--- a/Handwriting program/Handwriting program/obj/Debug/Handwriting program.csproj.FileListAbsolute.txt
+++ b/Handwriting program/Handwriting program/obj/Debug/Handwriting program.csproj.FileListAbsolute.txt
@@ -16,5 +16,4 @@ D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\Handwriting program\Handwri
D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\Handwriting program\Handwriting program\obj\Debug\Handwriting program.csproj.GenerateResource.Cache
D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\Handwriting program\Handwriting program\obj\Debug\Handwriting program.dll
D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\Handwriting program\Handwriting program\obj\Debug\Handwriting program.pdb
-D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\Handwriting program\Handwriting program\bin\Debug\Handwriting program.dll.CodeAnalysisLog.xml
-D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\Handwriting program\Handwriting program\bin\Debug\Handwriting program.dll.lastcodeanalysissucceeded
+D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\Handwriting program\Handwriting program\obj\Debug\Handwriting program.csprojResolveAssemblyReference.cache
diff --git a/Handwriting program/Handwriting program/obj/Debug/Handwriting program.dll b/Handwriting program/Handwriting program/obj/Debug/Handwriting program.dll
index c4ae40c..dece495 100644
Binary files a/Handwriting program/Handwriting program/obj/Debug/Handwriting program.dll and b/Handwriting program/Handwriting program/obj/Debug/Handwriting program.dll differ
diff --git a/Handwriting program/Handwriting program/obj/Debug/Handwriting program.pdb b/Handwriting program/Handwriting program/obj/Debug/Handwriting program.pdb
index 3fcee46..bb344b7 100644
Binary files a/Handwriting program/Handwriting program/obj/Debug/Handwriting program.pdb and b/Handwriting program/Handwriting program/obj/Debug/Handwriting program.pdb differ
diff --git a/MSGer.tk/.vs/MSGer.tk/v14/.suo b/MSGer.tk/.vs/MSGer.tk/v14/.suo
index 642db17..82c2775 100644
Binary files a/MSGer.tk/.vs/MSGer.tk/v14/.suo and b/MSGer.tk/.vs/MSGer.tk/v14/.suo differ
diff --git a/MSGer.tk/Forms/Emoticons.cs b/MSGer.tk/Forms/Emoticons.cs
index 0e97098..70223de 100644
--- a/MSGer.tk/Forms/Emoticons.cs
+++ b/MSGer.tk/Forms/Emoticons.cs
@@ -15,9 +15,9 @@ namespace MSGer.tk
public Emoticons()
{
InitializeComponent();
- label1.Text = Language.Translate(Language.StringID.Emoticons); //TODO: A ...-t a menüknél mindig adja hozzá
+ label1.Text = Language.Translate(Language.StringID.Emoticons);
this.Text = label1.Text;
- addbtn.Text = Language.Translate(Language.StringID.Add); //TODO: A teljesen megegyező string-eket jelezze
+ addbtn.Text = Language.Translate(Language.StringID.Add);
removebtn.Text = Language.Translate(Language.StringID.Remove);
closebtn.Text = Language.Translate(Language.StringID.Close);
label2.Text = Language.Translate(Language.StringID.SelectImage);
diff --git a/MSGer.tk/Forms/ErrorHandler.cs b/MSGer.tk/Forms/ErrorHandler.cs
index 456adad..479658c 100644
--- a/MSGer.tk/Forms/ErrorHandler.cs
+++ b/MSGer.tk/Forms/ErrorHandler.cs
@@ -132,7 +132,8 @@ namespace MSGer.tk
private void sendbtn_Click(object sender, EventArgs e)
{
- //TODO: Hibajelentés
+ //TODO: Hibajelentés szerveroldalon
+ Networking.SendRequest(Networking.RequestType.ErrorReport, textBox1.Text, 0, false); //2015.08.28.
}
}
public enum ErrorType
diff --git a/MSGer.tk/Forms/LanguageEditorForm.Designer.cs b/MSGer.tk/Forms/LanguageEditorForm.Designer.cs
new file mode 100644
index 0000000..61d9e45
--- /dev/null
+++ b/MSGer.tk/Forms/LanguageEditorForm.Designer.cs
@@ -0,0 +1,132 @@
+namespace MSGer.tk
+{
+ partial class LanguageEditorForm
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.label1 = new System.Windows.Forms.Label();
+ this.listView1 = new System.Windows.Forms.ListView();
+ this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.okbtn = new System.Windows.Forms.Button();
+ this.cancelbtn = new System.Windows.Forms.Button();
+ this.comboBox1 = new System.Windows.Forms.ComboBox();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.label1.Location = new System.Drawing.Point(8, 9);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(213, 25);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "LanguageEditorForm";
+ //
+ // listView1
+ //
+ this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.columnHeader1,
+ this.columnHeader2});
+ this.listView1.Location = new System.Drawing.Point(13, 64);
+ this.listView1.Name = "listView1";
+ this.listView1.Size = new System.Drawing.Size(404, 255);
+ this.listView1.TabIndex = 1;
+ this.listView1.UseCompatibleStateImageBehavior = false;
+ //
+ // columnHeader1
+ //
+ this.columnHeader1.Text = "";
+ //
+ // columnHeader2
+ //
+ this.columnHeader2.Text = "";
+ //
+ // okbtn
+ //
+ this.okbtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.okbtn.Location = new System.Drawing.Point(261, 347);
+ this.okbtn.Name = "okbtn";
+ this.okbtn.Size = new System.Drawing.Size(75, 23);
+ this.okbtn.TabIndex = 3;
+ this.okbtn.Text = "OK";
+ this.okbtn.UseVisualStyleBackColor = true;
+ //
+ // cancelbtn
+ //
+ this.cancelbtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.cancelbtn.Location = new System.Drawing.Point(342, 347);
+ this.cancelbtn.Name = "cancelbtn";
+ this.cancelbtn.Size = new System.Drawing.Size(75, 23);
+ this.cancelbtn.TabIndex = 4;
+ this.cancelbtn.Text = "Mégse";
+ this.cancelbtn.UseVisualStyleBackColor = true;
+ //
+ // comboBox1
+ //
+ this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.comboBox1.FormattingEnabled = true;
+ this.comboBox1.Items.AddRange(new object[] {
+ "Test",
+ "Testing"});
+ this.comboBox1.Location = new System.Drawing.Point(13, 37);
+ this.comboBox1.Name = "comboBox1";
+ this.comboBox1.Size = new System.Drawing.Size(208, 21);
+ this.comboBox1.TabIndex = 5;
+ //
+ // LanguageEditorForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(429, 382);
+ this.Controls.Add(this.comboBox1);
+ this.Controls.Add(this.cancelbtn);
+ this.Controls.Add(this.okbtn);
+ this.Controls.Add(this.listView1);
+ this.Controls.Add(this.label1);
+ this.Name = "LanguageEditorForm";
+ this.Text = "LanguageEditorForm";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.ListView listView1;
+ private System.Windows.Forms.ColumnHeader columnHeader1;
+ private System.Windows.Forms.ColumnHeader columnHeader2;
+ private System.Windows.Forms.Button okbtn;
+ private System.Windows.Forms.Button cancelbtn;
+ private System.Windows.Forms.ComboBox comboBox1;
+ }
+}
\ No newline at end of file
diff --git a/MSGer.tk/Forms/LanguageEditorForm.cs b/MSGer.tk/Forms/LanguageEditorForm.cs
new file mode 100644
index 0000000..bdf9a08
--- /dev/null
+++ b/MSGer.tk/Forms/LanguageEditorForm.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MSGer.tk
+{
+ public partial class LanguageEditorForm : Form
+ {
+ public LanguageEditorForm()
+ {
+ InitializeComponent();
+ this.Text = Language.Translate(Language.StringID.LanguageEditor);
+ label1.Text = this.Text;
+ domainUpDown1.Items.AddRange(Language.Languages);
+ listView1.Items.AddRange(Language.CurrentLanguage.Strings.Select(entry => new ListViewItem(new string[] { entry.Key, entry.Value })).ToArray());
+ cancelbtn.Text = Language.Translate(Language.StringID.Button_Cancel);
+ domainUpDown1.SelectedItemChanged += DomainUpDown1_SelectedItemChanged;
+ domainUpDown1.TextChanged += DomainUpDown1_TextChanged;
+ }
+
+ private void DomainUpDown1_TextChanged(object sender, EventArgs e)
+ {
+ var selectedlang = domainUpDown1.Items.OfType().FirstOrDefault(entry => entry.ToString() == domainUpDown1.Text);
+ if (selectedlang != null)
+ domainUpDown1.SelectedItem = selectedlang;
+ }
+
+ private void DomainUpDown1_SelectedItemChanged(object sender, EventArgs e)
+ {
+ throw new NotImplementedException();
+ }
+
+ private void domainUpDown1_Leave(object sender, EventArgs e)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/MSGer.tk/Forms/LanguageEditorForm.resx b/MSGer.tk/Forms/LanguageEditorForm.resx
new file mode 100644
index 0000000..29dcb1b
--- /dev/null
+++ b/MSGer.tk/Forms/LanguageEditorForm.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/MSGer.tk/Forms/LoginForm.cs b/MSGer.tk/Forms/LoginForm.cs
index 31e4d47..7f6b22a 100644
--- a/MSGer.tk/Forms/LoginForm.cs
+++ b/MSGer.tk/Forms/LoginForm.cs
@@ -153,21 +153,27 @@ namespace MSGer.tk
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
if (textBox1.Text.Length == 0)
- { //TODO: Fordítás
- MessageBox.Show("Nincs megadva felhasználónév."); //Translate!
+ {
+ //MessageBox.Show("Nincs megadva felhasználónév."); //Translate!
+ MessageBox.Show(Language.Translate(Language.StringID.NoUserNameForPasswordReset));
return;
}
- if (MessageBox.Show("Új jelszót kérsz a megadott névhez?", "", MessageBoxButtons.YesNo) == DialogResult.Yes)
+ //if (MessageBox.Show("Új jelszót kérsz a megadott névhez?", "", MessageBoxButtons.YesNo) == DialogResult.Yes)
+ if (MessageBox.Show(Language.Translate(Language.StringID.DoYouWantNewPassword), "", MessageBoxButtons.YesNo) == DialogResult.Yes)
{
string ret = Networking.SendRequest(Networking.RequestType.ResetPass, textBox1.Text, 0, false);
if (ret == "nouser")
- MessageBox.Show("A megadott felhasználó nem létezik.");
+ //MessageBox.Show("A megadott felhasználó nem létezik.");
+ MessageBox.Show(Language.Translate(Language.StringID.NonexistentUser));
else if (ret == "already")
- MessageBox.Show("A link MÁR el lett küldve az E-mail címedre.");
+ //MessageBox.Show("A link MÁR el lett küldve az E-mail címedre.");
+ MessageBox.Show(Language.Translate(Language.StringID.LinkAlreadySent));
else if (ret == "sent")
- MessageBox.Show("A link elküldve az E-mail címedre.");
+ //MessageBox.Show("A link elküldve az E-mail címedre.");
+ MessageBox.Show(Language.Translate(Language.StringID.LinkSent));
else if (ret.Contains("notsent"))
- MessageBox.Show("A link NEM lett elküldve az E-mail címedre.\nHiba: " + ret.Remove(ret.IndexOf("notsent"), "notsent".Length + 1));
+ //MessageBox.Show("A link NEM lett elküldve az E-mail címedre.\nHiba: " + ret.Remove(ret.IndexOf("notsent"), "notsent".Length + 1));
+ MessageBox.Show(Language.Translate(Language.StringID.LinkNotSent)+"\n"+Language.Translate(Language.StringID.Error) + ret.Remove(ret.IndexOf("notsent"), "notsent".Length + 1));
else
MessageBox.Show("Ismeretlen hiba:\n" + ret);
}
diff --git a/MSGer.tk/Language.cs b/MSGer.tk/Language.cs
index 2d01211..8f59886 100644
--- a/MSGer.tk/Language.cs
+++ b/MSGer.tk/Language.cs
@@ -228,7 +228,14 @@ namespace MSGer.tk
Text,
AreYouSure,
Handwriting,
- FileReceived
+ FileReceived,
+ NoUserNameForPasswordReset,
+ DoYouWantNewPassword,
+ NonexistentUser,
+ LinkAlreadySent,
+ LinkSent,
+ LinkNotSent,
+ LanguageEditor
} //TODO: Egyszerűsíteni az azonosítókat, nagyjából jelentsék azt, amit, és semmi több (pl. ne Menu_File_...)
#endregion
diff --git a/MSGer.tk/MSGer.tk.csproj b/MSGer.tk/MSGer.tk.csproj
index 8cf7da5..17f5bdd 100644
--- a/MSGer.tk/MSGer.tk.csproj
+++ b/MSGer.tk/MSGer.tk.csproj
@@ -162,6 +162,12 @@
SettingsPanelPersonal.cs
+
+ Form
+
+
+ LanguageEditorForm.cs
+
@@ -314,6 +320,9 @@
ThemeDesigner.cs
+
+ LanguageEditorForm.cs
+
ResXFileCodeGenerator
Resources.Designer.cs
diff --git a/MSGer.tk/NativeMethods.cs b/MSGer.tk/NativeMethods.cs
index 17c00db..78d645f 100644
--- a/MSGer.tk/NativeMethods.cs
+++ b/MSGer.tk/NativeMethods.cs
@@ -1,26 +1,26 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MSGer.tk
-{
- internal class NativeMethods
- {
- [StructLayout(LayoutKind.Sequential)]
- public struct MARGINS
- {
- public int Left;
- public int Right;
- public int Top;
- public int Bottom;
- }
- [DllImport("dwmapi.dll", PreserveSig = false)]
- public static extern void DwmExtendFrameIntoClientArea(IntPtr hwnd, ref MARGINS margins);
-
- [DllImport("dwmapi.dll", PreserveSig = false)]
- public static extern bool DwmIsCompositionEnabled();
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MSGer.tk
+{
+ internal class NativeMethods
+ {
+ [StructLayout(LayoutKind.Sequential)]
+ public struct MARGINS
+ {
+ public int Left;
+ public int Right;
+ public int Top;
+ public int Bottom;
+ }
+ [DllImport("dwmapi.dll", PreserveSig = false)]
+ public static extern void DwmExtendFrameIntoClientArea(IntPtr hwnd, ref MARGINS margins);
+
+ [DllImport("dwmapi.dll", PreserveSig = false)]
+ public static extern bool DwmIsCompositionEnabled();
+ }
+}
diff --git a/MSGer.tk/Networking/Networking.SendRequest.cs b/MSGer.tk/Networking/Networking.SendRequest.cs
index 3f4ce2a..f464362 100644
--- a/MSGer.tk/Networking/Networking.SendRequest.cs
+++ b/MSGer.tk/Networking/Networking.SendRequest.cs
@@ -26,7 +26,8 @@ namespace MSGer.tk
SetState,
IsPartner,
KeepActive,
- CheckUser
+ CheckUser,
+ ErrorReport
}
public const string WebAddress = "http://msger.url.ph"; //TODO: HTTPS
private static int Tries = 0;
diff --git a/MSGer.tk/UserInfo.cs b/MSGer.tk/UserInfo.cs
index f9d8bf0..e1cd9ec 100644
--- a/MSGer.tk/UserInfo.cs
+++ b/MSGer.tk/UserInfo.cs
@@ -449,26 +449,15 @@ namespace MSGer.tk
UpdateTimer.Dispose(); //2015.08.23.
}
- // TODO: free unmanaged resources (unmanaged objects) and override a finalizer below.
- // TODO: set large fields to null.
-
disposedValue = true;
}
}
- // TODO: override a finalizer only if Dispose(bool disposing) above has code to free unmanaged resources.
- // ~UserInfo() {
- // // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
- // Dispose(false);
- // }
-
// This code added to correctly implement the disposable pattern.
public void Dispose()
{
// Do not change this code. Put cleanup code in Dispose(bool disposing) above.
Dispose(true);
- // TODO: uncomment the following line if the finalizer is overridden above.
- // GC.SuppressFinalize(this);
}
#endregion
}
diff --git a/MSGer.tk/bin/Debug/MSGer.tk.exe.CodeAnalysisLog.xml b/MSGer.tk/bin/Debug/MSGer.tk.exe.CodeAnalysisLog.xml
deleted file mode 100644
index 489d73e..0000000
--- a/MSGer.tk/bin/Debug/MSGer.tk.exe.CodeAnalysisLog.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- Category
- Certainty
- Collapse All
- Check Id
- Error
- error(s)
- Expand All
- Help
- Line
- message(s)
- [Location not stored in Pdb]
- Project
- Resolution
- Rule
- Rule File
- Rule Description
- Source
- Status
- Target
- Warning
- warning(s)
- Code Analysis Report
-
-
diff --git a/MSGerTextBox/bin/Debug/MSGerTextBox.exe b/MSGerTextBox/bin/Debug/MSGerTextBox.exe
index b9cff05..13b444e 100644
Binary files a/MSGerTextBox/bin/Debug/MSGerTextBox.exe and b/MSGerTextBox/bin/Debug/MSGerTextBox.exe differ
diff --git a/MSGerTextBox/bin/Debug/MSGerTextBox.pdb b/MSGerTextBox/bin/Debug/MSGerTextBox.pdb
index 8471402..69ef9fc 100644
Binary files a/MSGerTextBox/bin/Debug/MSGerTextBox.pdb and b/MSGerTextBox/bin/Debug/MSGerTextBox.pdb differ
diff --git a/MSGerTextBox/obj/Debug/MSGerTextBox.csproj.FileListAbsolute.txt b/MSGerTextBox/obj/Debug/MSGerTextBox.csproj.FileListAbsolute.txt
index 07f961c..94f0967 100644
--- a/MSGerTextBox/obj/Debug/MSGerTextBox.csproj.FileListAbsolute.txt
+++ b/MSGerTextBox/obj/Debug/MSGerTextBox.csproj.FileListAbsolute.txt
@@ -7,5 +7,4 @@ D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\MSGerTextBox\obj\Debug\MSGe
D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\MSGerTextBox\obj\Debug\MSGerTextBox.csproj.GenerateResource.Cache
D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\MSGerTextBox\obj\Debug\MSGerTextBox.exe
D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\MSGerTextBox\obj\Debug\MSGerTextBox.pdb
-D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\MSGerTextBox\bin\Debug\MSGerTextBox.exe.CodeAnalysisLog.xml
-D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\MSGerTextBox\bin\Debug\MSGerTextBox.exe.lastcodeanalysissucceeded
+D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\MSGerTextBox\obj\Debug\MSGerTextBox.csprojResolveAssemblyReference.cache
diff --git a/MSGerTextBox/obj/Debug/MSGerTextBox.exe b/MSGerTextBox/obj/Debug/MSGerTextBox.exe
index b9cff05..13b444e 100644
Binary files a/MSGerTextBox/obj/Debug/MSGerTextBox.exe and b/MSGerTextBox/obj/Debug/MSGerTextBox.exe differ
diff --git a/MSGerTextBox/obj/Debug/MSGerTextBox.pdb b/MSGerTextBox/obj/Debug/MSGerTextBox.pdb
index 8471402..69ef9fc 100644
Binary files a/MSGerTextBox/obj/Debug/MSGerTextBox.pdb and b/MSGerTextBox/obj/Debug/MSGerTextBox.pdb differ
diff --git a/RichListView/RichListView/ItemClickEventArgs.cs b/RichListView/RichListView/ItemClickEventArgs.cs
index fe1e221..f79614f 100644
--- a/RichListView/RichListView/ItemClickEventArgs.cs
+++ b/RichListView/RichListView/ItemClickEventArgs.cs
@@ -1,17 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SzNPProjects
-{
- public class ItemClickEventArgs : EventArgs
- { //2015.08.23.
- public int ItemIndex { get; private set; }
- public ItemClickEventArgs(int itemindex)
- {
- ItemIndex = itemindex;
- }
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SzNPProjects
+{
+ public class ItemClickEventArgs : EventArgs
+ { //2015.08.23.
+ public int ItemIndex { get; private set; }
+ public ItemClickEventArgs(int itemindex)
+ {
+ ItemIndex = itemindex;
+ }
+ }
+}
diff --git a/RichListView/RichListView/bin/Debug/RichListView.dll b/RichListView/RichListView/bin/Debug/RichListView.dll
index b6e3516..774c1af 100644
Binary files a/RichListView/RichListView/bin/Debug/RichListView.dll and b/RichListView/RichListView/bin/Debug/RichListView.dll differ
diff --git a/RichListView/RichListView/bin/Debug/RichListView.pdb b/RichListView/RichListView/bin/Debug/RichListView.pdb
index 6d1ad6c..9f8667d 100644
Binary files a/RichListView/RichListView/bin/Debug/RichListView.pdb and b/RichListView/RichListView/bin/Debug/RichListView.pdb differ
diff --git a/RichListView/RichListView/obj/Debug/RichListView.csproj.FileListAbsolute.txt b/RichListView/RichListView/obj/Debug/RichListView.csproj.FileListAbsolute.txt
index e0cf3e5..43c6687 100644
--- a/RichListView/RichListView/obj/Debug/RichListView.csproj.FileListAbsolute.txt
+++ b/RichListView/RichListView/obj/Debug/RichListView.csproj.FileListAbsolute.txt
@@ -12,5 +12,4 @@ D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\RichListView\RichListView\o
D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\RichListView\RichListView\obj\Debug\RichListView.csproj.GenerateResource.Cache
D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\RichListView\RichListView\obj\Debug\RichListView.dll
D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\RichListView\RichListView\obj\Debug\RichListView.pdb
-D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\RichListView\RichListView\bin\Debug\RichListView.dll.CodeAnalysisLog.xml
-D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\RichListView\RichListView\bin\Debug\RichListView.dll.lastcodeanalysissucceeded
+D:\Z - Norbi cucca\0 Projektek\MSGer.tk\0 Repository\RichListView\RichListView\obj\Debug\RichListView.csprojResolveAssemblyReference.cache
diff --git a/RichListView/RichListView/obj/Debug/RichListView.dll b/RichListView/RichListView/obj/Debug/RichListView.dll
index b6e3516..774c1af 100644
Binary files a/RichListView/RichListView/obj/Debug/RichListView.dll and b/RichListView/RichListView/obj/Debug/RichListView.dll differ
diff --git a/RichListView/RichListView/obj/Debug/RichListView.pdb b/RichListView/RichListView/obj/Debug/RichListView.pdb
index 6d1ad6c..9f8667d 100644
Binary files a/RichListView/RichListView/obj/Debug/RichListView.pdb and b/RichListView/RichListView/obj/Debug/RichListView.pdb differ
diff --git a/Versions/Less Closed Beta/v5.0/MSGer.tk/bin/Debug/test.cs b/Versions/Less Closed Beta/v5.0/MSGer.tk/bin/Debug/test.cs
index de81df9..4de216b 100644
--- a/Versions/Less Closed Beta/v5.0/MSGer.tk/bin/Debug/test.cs
+++ b/Versions/Less Closed Beta/v5.0/MSGer.tk/bin/Debug/test.cs
@@ -1,14 +1,14 @@
-using System;
-using MSGer.tk;
-
-public class Test : IScript
-{
- public void Load()
- {
- Console.WriteLine("Script Loaded!");
- }
- public void Unload()
- {
- Console.WriteLine("Script Unloaded!");
- }
-}
+using System;
+using MSGer.tk;
+
+public class Test : IScript
+{
+ public void Load()
+ {
+ Console.WriteLine("Script Loaded!");
+ }
+ public void Unload()
+ {
+ Console.WriteLine("Script Unloaded!");
+ }
+}
diff --git a/Versions/Less Closed Beta/v7.0/Changelog.txt b/Versions/Less Closed Beta/v7.0/Changelog.txt
index 1a1ed29..7a4a28e 100644
--- a/Versions/Less Closed Beta/v7.0/Changelog.txt
+++ b/Versions/Less Closed Beta/v7.0/Changelog.txt
@@ -1,4 +1,4 @@
-v7.0 - 2015.07.05-06., 08.23.
+v7.0 - 2015.07.05-06., 08.23-24., 08.26.
----
- A hangulatjelek ablaka bevonva a tmarendszerbe
- tllva Git-re