diff --git a/src/webimtray/WebIMTray/App.Designer.cs b/src/webimtray/WebIMTray/App.Designer.cs
index 0c341a3a..1f85b56c 100644
--- a/src/webimtray/WebIMTray/App.Designer.cs
+++ b/src/webimtray/WebIMTray/App.Designer.cs
@@ -60,16 +60,16 @@ namespace webImTray {
}
}
- internal static System.Drawing.Bitmap _01_navigate {
+ internal static System.Drawing.Bitmap hide {
get {
- object obj = ResourceManager.GetObject("_01_navigate", resourceCulture);
+ object obj = ResourceManager.GetObject("hide", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap _02_properties {
+ internal static System.Drawing.Bitmap history {
get {
- object obj = ResourceManager.GetObject("_02_properties", resourceCulture);
+ object obj = ResourceManager.GetObject("history", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -87,5 +87,26 @@ namespace webImTray {
return ((System.Drawing.Icon)(obj));
}
}
+
+ internal static System.Drawing.Bitmap options {
+ get {
+ object obj = ResourceManager.GetObject("options", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap refresh {
+ get {
+ object obj = ResourceManager.GetObject("refresh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap visitors {
+ get {
+ object obj = ResourceManager.GetObject("visitors", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
diff --git a/src/webimtray/WebIMTray/App.resx b/src/webimtray/WebIMTray/App.resx
index 3b259b8c..787c2295 100644
--- a/src/webimtray/WebIMTray/App.resx
+++ b/src/webimtray/WebIMTray/App.resx
@@ -118,16 +118,25 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ toolbarImages\hide.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ toolbarImages\history.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
icons\Notify.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
icons\Notify_offl.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- toolbarImages\01 navigate.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ toolbarImages\options.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- toolbarImages\02 properties.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ toolbarImages\refresh.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ toolbarImages\visitors.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/src/webimtray/WebIMTray/Main.Designer.cs b/src/webimtray/WebIMTray/Main.Designer.cs
index 40d682bd..ddc9cbd3 100644
--- a/src/webimtray/WebIMTray/Main.Designer.cs
+++ b/src/webimtray/WebIMTray/Main.Designer.cs
@@ -28,6 +28,8 @@ namespace webImTray {
this.webBrowser1 = new System.Windows.Forms.WebBrowser();
this.reloadPageTimer = new System.Windows.Forms.Timer(this.components);
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+ this.visitorsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.historyMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.refreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.hideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -82,30 +84,48 @@ namespace webImTray {
// menuStrip1
//
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.visitorsMenuItem,
+ this.historyMenuItem,
this.refreshToolStripMenuItem,
this.optionsMenuItem,
this.hideToolStripMenuItem});
resources.ApplyResources(this.menuStrip1, "menuStrip1");
this.menuStrip1.Name = "menuStrip1";
+ this.menuStrip1.ShowItemToolTips = true;
+ //
+ // visitorsMenuItem
+ //
+ this.visitorsMenuItem.Image = global::webImTray.App.visitors;
+ resources.ApplyResources(this.visitorsMenuItem, "visitorsMenuItem");
+ this.visitorsMenuItem.Name = "visitorsMenuItem";
+ this.visitorsMenuItem.Click += new System.EventHandler(this.toolNavigate_Click);
+ //
+ // historyMenuItem
+ //
+ this.historyMenuItem.Image = global::webImTray.App.history;
+ resources.ApplyResources(this.historyMenuItem, "historyMenuItem");
+ this.historyMenuItem.Name = "historyMenuItem";
+ this.historyMenuItem.Click += new System.EventHandler(this.toolHistory_Click);
//
// refreshToolStripMenuItem
//
- this.refreshToolStripMenuItem.Image = global::webImTray.App._01_navigate;
+ this.refreshToolStripMenuItem.Image = global::webImTray.App.refresh;
resources.ApplyResources(this.refreshToolStripMenuItem, "refreshToolStripMenuItem");
this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem";
this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click);
//
// optionsMenuItem
//
- this.optionsMenuItem.Image = global::webImTray.App._02_properties;
+ this.optionsMenuItem.Image = global::webImTray.App.options;
resources.ApplyResources(this.optionsMenuItem, "optionsMenuItem");
this.optionsMenuItem.Name = "optionsMenuItem";
this.optionsMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem1_Click);
//
// hideToolStripMenuItem
//
- this.hideToolStripMenuItem.Name = "hideToolStripMenuItem";
+ this.hideToolStripMenuItem.Image = global::webImTray.App.hide;
resources.ApplyResources(this.hideToolStripMenuItem, "hideToolStripMenuItem");
+ this.hideToolStripMenuItem.Name = "hideToolStripMenuItem";
this.hideToolStripMenuItem.Click += new System.EventHandler(this.hideApp);
//
// MainWindow
@@ -139,6 +159,8 @@ namespace webImTray {
private System.Windows.Forms.ToolStripMenuItem refreshToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem optionsMenuItem;
private System.Windows.Forms.ToolStripMenuItem hideToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem visitorsMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem historyMenuItem;
}
}
diff --git a/src/webimtray/WebIMTray/Main.cs b/src/webimtray/WebIMTray/Main.cs
index 378a62cc..5b52332c 100644
--- a/src/webimtray/WebIMTray/Main.cs
+++ b/src/webimtray/WebIMTray/Main.cs
@@ -43,7 +43,7 @@ namespace webImTray {
void navigateThere() {
#if DEBUG
- webBrowser1.Navigate("http://localhost:8080/webim/operator/users.php");
+ webBrowser1.Navigate("http://openwebim.org/webim/operator/users.php?nomenu");
#else
webBrowser1.Navigate(Options.WebIMServer + Options.PENDING_USERS_PAGE);
#endif
@@ -172,11 +172,6 @@ namespace webImTray {
}
}
- private void exitToolStripMenuItem1_Click(object sender, EventArgs e)
- {
-
- }
-
private void optionsToolStripMenuItem1_Click(object sender, EventArgs e) {
OptionsDialog dialog = new OptionsDialog();
dialog.ShowDialog(this);
@@ -190,7 +185,7 @@ namespace webImTray {
}
private void refreshToolStripMenuItem_Click(object sender, EventArgs e) {
- navigateThere();
+ webBrowser1.Refresh();
}
private void hideWindowToolStripMenuItem_Click(object sender, EventArgs e) {
@@ -207,5 +202,10 @@ namespace webImTray {
{
hideWindow();
}
+
+ private void toolHistory_Click(object sender, EventArgs e)
+ {
+ webBrowser1.Navigate(Options.WebIMServer + Options.HISTORY_PAGE);
+ }
}
}
diff --git a/src/webimtray/WebIMTray/Main.resx b/src/webimtray/WebIMTray/Main.resx
index 50b49f9c..0cca821b 100644
--- a/src/webimtray/WebIMTray/Main.resx
+++ b/src/webimtray/WebIMTray/Main.resx
@@ -124,6 +124,33 @@
245, 102
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAIVJREFUOE/dk0EO
+ gCAMBPlgv+l/DBcTH4O2WrLCFi56kaQJgXbYbUNKXy4RKSz2bT3PF4vwfS3MOdO4oAOAF48hN4BJ1Jdn
+ kKpAE321RRHkYcEBmKxABnO12rhOgV9WOQ3Eodh1mwJawGK0hftubDNAqygEoAU2GWbBYD9REH0adv76
+ 5z0AIQLwRor4ZGsAAAAASUVORK5CYII=
+
+
+
+ Silver
+
+
+ 130, 22
+
+
+ Options..
+
+
+ 127, 6
+
+
+ 130, 22
+
+
+ Exit
+
131, 54
@@ -165,33 +192,6 @@
True
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAIVJREFUOE/dk0EO
- gCAMBPlgv+l/DBcTH4O2WrLCFi56kaQJgXbYbUNKXy4RKSz2bT3PF4vwfS3MOdO4oAOAF48hN4BJ1Jdn
- kKpAE321RRHkYcEBmKxABnO12rhOgV9WOQ3Eodh1mwJawGK0hftubDNAqygEoAU2GWbBYD9REH0adv76
- 5z0AIQLwRor4ZGsAAAAASUVORK5CYII=
-
-
-
- Silver
-
-
- 130, 22
-
-
- Options..
-
-
- 127, 6
-
-
- 130, 22
-
-
- Exit
-
Fill
@@ -223,8 +223,26 @@
0, 0
+
+ Black
+
+
+ 69, 20
+
+
+ Visitors
+
+
+ Black
+
+
+ 69, 20
+
+
+ History
+
- Silver
+ Black
73, 20
@@ -241,11 +259,14 @@
Options
+
+ Black
+
Esc
- 40, 20
+ 56, 20
Hide
@@ -338,6 +359,18 @@
System.Windows.Forms.Timer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ visitorsMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ historyMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
refreshToolStripMenuItem
diff --git a/src/webimtray/WebIMTray/Options.cs b/src/webimtray/WebIMTray/Options.cs
index 2e9c8349..615bab06 100644
--- a/src/webimtray/WebIMTray/Options.cs
+++ b/src/webimtray/WebIMTray/Options.cs
@@ -10,7 +10,8 @@ namespace webImTray {
class Options {
public const string DEFAULT_SERVER = "http://openwebim.org/webim";
- public const string PENDING_USERS_PAGE = "/operator/users.php";
+ public const string PENDING_USERS_PAGE = "/operator/users.php?nomenu";
+ public const string HISTORY_PAGE = "/operator/history.php";
public const string SETTINGS_PAGE = "/operator/operators.php";
private const string HTTP_PREFIX = "http://";
diff --git a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.resx b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.resx
index ef5aa458..456067c3 100644
--- a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.resx
+++ b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.resx
@@ -117,78 +117,11 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- hideWhenStarted
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 0
-
-
- autoStart
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 1
-
-
- showInTaskBar
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 2
-
-
-
- Tahoma, 9.75pt, style=Bold
-
-
- 3, 3
-
-
-
- 12, 12, 12, 12
-
-
- 368, 106
-
-
- 0
-
-
- Application
-
-
- groupBox1
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 2
-
True
+
Microsoft Sans Serif, 8.25pt
@@ -276,83 +209,36 @@
2
-
- textBox2
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 0
-
-
- textBox1
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 1
-
-
- showOptions
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 2
-
-
- showHide
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 3
-
-
+
Tahoma, 9.75pt, style=Bold
-
- 3, 115
+
+ 3, 3
-
+
+
12, 12, 12, 12
-
- 368, 89
+
+ 368, 106
-
- 1
+
+ 0
-
- Hotkeys
+
+ Application
-
- groupBox2
+
+ groupBox1
-
+
System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
- 1
+
+ 2
False
@@ -474,6 +360,39 @@
3
+
+ Tahoma, 9.75pt, style=Bold
+
+
+ 3, 115
+
+
+ 12, 12, 12, 12
+
+
+ 368, 89
+
+
+ 1
+
+
+ Hotkeys
+
+
+ groupBox2
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 1
+
+
+ False
+
Tahoma, 9.75pt
diff --git a/src/webimtray/WebIMTray/webImTray.csproj b/src/webimtray/WebIMTray/webImTray.csproj
index 41cf1044..1149d8a6 100644
--- a/src/webimtray/WebIMTray/webImTray.csproj
+++ b/src/webimtray/WebIMTray/webImTray.csproj
@@ -100,9 +100,12 @@
-
+
+
+
+
+
-
True
True