OSDN > Find Software > Multimedia > Sound/Audio > PeerCast IM > SCM > git > PeerCastIM > Commit

PeerCast IM
Fork

R/O
HTTP
SSH
HTTPS

PeerCastIM: Commit

Commit MetaInfo

Revision	f7da08786a05a8f091c637d627303d9486b082ff (tree)
Time	2007-12-22 22:52:47
Author	eru <eru01@user...>
Commiter	eru

Log Message

起動時にGUI表示
GUIを自動で最前面機能追加

Change Summary

modified: PeerCast.root/PeerCast/core/common/servmgr.cpp (diff)
modified: PeerCast.root/PeerCast/core/common/servmgr.h (diff)
modified: PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp (diff)
modified: PeerCast.root/PeerCast/ui/win32/simple/Simple.rc (diff)
modified: PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj (diff)
modified: PeerCast.root/PeerCast/ui/win32/simple/gui.cpp (diff)
modified: PeerCast.root/PeerCast/ui/win32/simple/resource.h (diff)
modified: c:/Git/PeerCast.root/PeerCast/core/common/servmgr.cpp (diff)
modified: c:/Git/PeerCast.root/PeerCast/core/common/servmgr.h (diff)
modified: c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp (diff)
modified: c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc (diff)
modified: c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj (diff)
modified: c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp (diff)
modified: c:/Git/PeerCast.root/PeerCast/ui/win32/simple/resource.h (diff)

Incremental Difference

--- a/PeerCast.root/PeerCast/core/common/servmgr.cpp

+++ b/PeerCast.root/PeerCast/core/common/servmgr.cpp

		@@ -138,6 +138,9 @@ ServMgr::ServMgr()
138	138	saveGuiPos = false;
139	139	keepDownstreams = true;
140	140
	141	+ topmostGui = false;
	142	+ startWithGui = false;
	143	+
141	144	chanLog="";
142	145
143	146	maxRelaysIndexTxt = 1; // for PCRaw (relay)

		@@ -1053,6 +1056,9 @@ void ServMgr::saveSettings(const char *fn)
1053	1056	iniFile.writeIntValue("guiLeft", winPlace.rcNormalPosition.left);
1054	1057	iniFile.writeIntValue("guiRight", winPlace.rcNormalPosition.right);
1055	1058	}
	1059	+
	1060	+ iniFile.writeBoolValue("topmostGui", servMgr->topmostGui);
	1061	+ iniFile.writeBoolValue("startWithGui", servMgr->startWithGui);
1056	1062	#endif
1057	1063	int i;
1058	1064

		@@ -1431,6 +1437,14 @@ void ServMgr::loadSettings(const char *fn)
1431	1437	guiFlg = true;
1432	1438	}
1433	1439	}
	1440	+
	1441	+ else if (iniFile.isName("topmostGui"))
	1442	+ {
	1443	+ servMgr->topmostGui = iniFile.getBoolValue();
	1444	+ } else if (iniFile.isName("startWithGui"))
	1445	+ {
	1446	+ servMgr->startWithGui = iniFile.getBoolValue();
	1447	+ }
1434	1448	#endif
1435	1449
1436	1450	// debug

--- a/PeerCast.root/PeerCast/core/common/servmgr.h

+++ b/PeerCast.root/PeerCast/core/common/servmgr.h

		@@ -416,6 +416,9 @@ public:
416	416	bool saveGuiPos;
417	417	bool keepDownstreams;
418	418
	419	+ bool topmostGui; // 最前面
	420	+ bool startWithGui; // 起動時にGUI
	421	+
419	422	int maxRelaysIndexTxt; // for PCRaw (relay)
420	423
421	424	private:

--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp

+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp

		@@ -75,6 +75,9 @@ bool chanInfoIsRelayed;
75	75	String exePath;
76	76	ULONG_PTR gdiplusToken;
77	77
	78	+// プロトタイプ宣言
	79	+void createGUI(HWND);
	80	+
78	81	// ---------------------------------
79	82	Sys * APICALL MyPeercastInst::createSys()
80	83	{

		@@ -390,6 +393,11 @@ int APIENTRY WinMain(HINSTANCE hInstance,
390	393	if (mask & ServMgr::NT_TRACKINFO)
391	394	CheckMenuItem(trayMenu,ID_POPUP_SHOWMESSAGES_TRACKINFO,MF_CHECKED\|MF_BYCOMMAND);
392	395
	396	+ if (servMgr->startWithGui)
	397	+ {
	398	+ createGUI((HWND)0);
	399	+ }
	400	+
393	401	// Main message loop:
394	402	while (GetMessage(&msg, NULL, 0, 0))
395	403	{

		@@ -823,6 +831,12 @@ void createGUI(HWND hWnd)
823	831	NULL);
824	832	}
825	833	ShowWindow(guiWnd,SW_SHOWNORMAL);
	834	+
	835	+ // 自動で最前面
	836	+ if (servMgr->topmostGui)
	837	+ {
	838	+ ::SetWindowPos(guiWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE\|SWP_NOSIZE);
	839	+ }
826	840	}
827	841
828	842

		@@ -1046,6 +1060,23 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
1046	1060	CheckMenuItem(trayMenu, ID_POPUP_SAVE_GUI_POS, MF_UNCHECKED\|MF_BYCOMMAND);
1047	1061	}
1048	1062
	1063	+ // 自動GUI/最前面機能
	1064	+ if (servMgr->topmostGui)
	1065	+ {
	1066	+ CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_CHECKED\|MF_BYCOMMAND);
	1067	+ } else
	1068	+ {
	1069	+ CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_UNCHECKED\|MF_BYCOMMAND);
	1070	+ }
	1071	+
	1072	+ if (servMgr->startWithGui)
	1073	+ {
	1074	+ CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_CHECKED\|MF_BYCOMMAND);
	1075	+ } else
	1076	+ {
	1077	+ CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_UNCHECKED\|MF_BYCOMMAND);
	1078	+ }
	1079	+
1049	1080	SetForegroundWindow(hWnd);
1050	1081	bool skipMenu=false;
1051	1082

		@@ -1256,6 +1287,34 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
1256	1287	//peercastInst->saveSettings();
1257	1288	break;
1258	1289
	1290	+ case ID_POPUP_TOPMOST:
	1291	+ // 最前面表示
	1292	+ if (servMgr->topmostGui)
	1293	+ {
	1294	+ servMgr->topmostGui = false;
	1295	+ CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_UNCHECKED\|MF_BYCOMMAND);
	1296	+ } else
	1297	+ {
	1298	+ servMgr->topmostGui = true;
	1299	+ CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_CHECKED\|MF_BYCOMMAND);
	1300	+ }
	1301	+ peercastInst->saveSettings();
	1302	+ break;
	1303	+
	1304	+ case ID_POPUP_START_WITH_GUI:
	1305	+ // 起動時にGUI表示
	1306	+ if (servMgr->startWithGui)
	1307	+ {
	1308	+ servMgr->startWithGui = false;
	1309	+ CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_UNCHECKED\|MF_BYCOMMAND);
	1310	+ } else
	1311	+ {
	1312	+ servMgr->startWithGui = true;
	1313	+ CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_CHECKED\|MF_BYCOMMAND);
	1314	+ }
	1315	+ peercastInst->saveSettings();
	1316	+ break;
	1317	+
1259	1318	case ID_POPUP_EXIT_CONFIRM:
1260	1319	case IDM_EXIT:
1261	1320	DestroyWindow(hWnd);

--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc

+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc

		@@ -38,47 +38,38 @@ IDR_TRAYMENU MENU
38	38	BEGIN
39	39	POPUP "popup"
40	40	BEGIN
41		- MENUITEM "情報", ID_POPUP_ABOUT
42		- MENUITEM "ヘルプ", ID_POPUP_HELP
	41	+ MENUITEM "情報", ID_POPUP_ABOUT
	42	+ MENUITEM "ヘルプ", ID_POPUP_HELP
43	43	MENUITEM SEPARATOR
44	44	POPUP "ポップアップメッセージ"
45	45	BEGIN
46	46	MENUITEM "PeerCast", ID_POPUP_SHOWMESSAGES_PEERCAST
47		-
48		- MENUITEM "配信者", ID_POPUP_SHOWMESSAGES_BROADCASTERS
49		-
50		- MENUITEM "トラック情報", ID_POPUP_SHOWMESSAGES_TRACKINFO
51		-
52		- MENUITEM "アップデート情報", ID_POPUP_POPUPMESSAGES_UPGRADEALERTS
53		- , CHECKED, GRAYED
	47	+ MENUITEM "配信者", ID_POPUP_SHOWMESSAGES_BROADCASTERS
	48	+ MENUITEM "トラック情報", ID_POPUP_SHOWMESSAGES_TRACKINFO
	49	+ MENUITEM "アップデート情報", ID_POPUP_POPUPMESSAGES_UPGRADEALERTS, CHECKED, GRAYED
54	50	END
55	51	POPUP "高度"
56	52	BEGIN
57		- MENUITEM "情報", ID_POPUP_ADVANCED_INFORMATION
58		-
59		- MENUITEM "リレーチャンネル", ID_POPUP_ADVANCED_RELAYEDCHANNELS
60		-
61		- MENUITEM "配信", ID_POPUP_ADVANCED_BROADCAST
62		-
63		- MENUITEM "コネクション", ID_POPUP_CONNECTIONS
64		- MENUITEM "ログ", ID_POPUP_ADVANCED_VIEWLOG
65		-
66		- MENUITEM "設定", ID_POPUP_SETTINGS
67		- MENUITEM "GUIを開く", ID_POPUP_ADVANCED_SHOWGUI
68		-
	53	+ MENUITEM "情報", ID_POPUP_ADVANCED_INFORMATION
	54	+ MENUITEM "リレーチャンネル", ID_POPUP_ADVANCED_RELAYEDCHANNELS
	55	+ MENUITEM "配信", ID_POPUP_ADVANCED_BROADCAST
	56	+ MENUITEM "コネクション", ID_POPUP_CONNECTIONS
	57	+ MENUITEM "ログ", ID_POPUP_ADVANCED_VIEWLOG
	58	+ MENUITEM "設定", ID_POPUP_SETTINGS
	59	+ MENUITEM "GUIを開く", ID_POPUP_ADVANCED_SHOWGUI
69	60	END
70	61	POPUP "追加設定"
71	62	BEGIN
72		- MENUITEM "終了時、表示位置を保存", ID_POPUP_SAVE_GUI_POS
73		- , CHECKED
74		- MENUITEM "再接続時下流維持", ID_POPUP_KEEP_DOWNSTREAMS
75		- , CHECKED
	63	+ MENUITEM "終了時、表示位置を保存", ID_POPUP_SAVE_GUI_POS, CHECKED
	64	+ MENUITEM "再接続時下流維持", ID_POPUP_SHOWGUI, CHECKED
	65	+ MENUITEM "常に手前に表示", ID_POPUP_TOPMOST
	66	+ MENUITEM "起動時、GUIを表示", ID_POPUP_START_WITH_GUI
76	67	END
77	68	MENUITEM SEPARATOR
78	69	POPUP "終了"
79	70	BEGIN
80		- MENUITEM "はい", ID_POPUP_EXIT_CONFIRM
81		- MENUITEM "いいえ", ID_POPUP_EXIT_NO
	71	+ MENUITEM "はい", ID_POPUP_EXIT_CONFIRM
	72	+ MENUITEM "いいえ", ID_POPUP_EXIT_NO
82	73	END
83	74	END
84	75	END

		@@ -88,7 +79,7 @@ BEGIN
88	79	POPUP "popup"
89	80	BEGIN
90	81	MENUITEM SEPARATOR
91		- MENUITEM "イエローページ", ID_POPUP_YELLOWPAGES
	82	+ MENUITEM "イエローページ", ID_POPUP_YELLOWPAGES
92	83	POPUP "イエローページ"
93	84	BEGIN
94	85	MENUITEM "AAA", ID_POPUP_YELLOWPAGES1

		@@ -97,7 +88,7 @@ BEGIN
97	88	END
98	89	END
99	90
100		-IDR_GUIMENU MENU
	91	+IDR_GUIMENU MENU
101	92	BEGIN
102	93	POPUP "popup"
103	94	BEGIN

		@@ -111,51 +102,41 @@ BEGIN
111	102	END
112	103	END
113	104
	105	+
114	106	/////////////////////////////////////////////////////////////////////////////
115	107	//
116	108	// Dialog
117	109	//
118	110
119	111	IDD_MAINWINDOW DIALOGEX 0, 0, 298, 341
120		-STYLE DS_SETFONT \| DS_CENTER \| WS_MINIMIZEBOX \| WS_CAPTION \| WS_SYSMENU \|
121		- WS_THICKFRAME
	112	+STYLE DS_SETFONT \| DS_CENTER \| WS_MINIMIZEBOX \| WS_CAPTION \| WS_SYSMENU \| WS_THICKFRAME
122	113	EXSTYLE WS_EX_APPWINDOW
123	114	CAPTION "PeerCast"
124	115	FONT 9, "MS UI Gothic", 0, 0, 0x1
125	116	BEGIN
126		- LISTBOX IDC_LIST1,3,291,291,43,LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \|
127		- WS_TABSTOP
128		- CONTROL "有効",IDC_CHECK1,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \|
129		- WS_TABSTOP,9,29,60,20,WS_EX_TRANSPARENT
	117	+ LISTBOX IDC_LIST1,3,291,291,43,LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	118	+ CONTROL "有効",IDC_CHECK1,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,9,29,60,20,WS_EX_TRANSPARENT
130	119	EDITTEXT IDC_EDIT1,127,18,47,12,ES_AUTOHSCROLL
131	120	RTEXT "ポート :",IDC_STATIC,107,20,18,8
132		- LISTBOX IDC_LIST2,3,206,291,71,LBS_OWNERDRAWFIXED \|
133		- LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	121	+ LISTBOX IDC_LIST2,3,206,291,71,LBS_OWNERDRAWFIXED \| LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
134	122	LTEXT "ログ",IDC_STATIC_LOG,3,282,13,8
135	123	LTEXT "コネクション",IDC_STATIC_CONNECTION,3,184,40,8
136	124	GROUPBOX "",IDC_STATIC,3,4,291,49
137	125	PUSHBUTTON "クリア",IDC_BUTTON1,35,279,25,11
138		- LISTBOX IDC_LIST3,3,81,291,67,LBS_OWNERDRAWFIXED \|
139		- LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	126	+ LISTBOX IDC_LIST3,3,81,291,67,LBS_OWNERDRAWFIXED \| LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
140	127	PUSHBUTTON "切断",IDC_BUTTON5,67,65,43,13
141	128	GROUPBOX "リレー",IDC_GROUPBOX_RELAY,3,54,291,96
142	129	EDITTEXT IDC_EDIT3,127,34,47,12,ES_PASSWORD \| ES_AUTOHSCROLL
143	130	RTEXT "パスワード :",IDC_STATIC,89,36,36,8
144		- CONTROL "デバッグ",IDC_LOGDEBUG,"Button",BS_AUTOCHECKBOX \|
145		- BS_PUSHLIKE \| WS_TABSTOP,127,279,32,11
146		- CONTROL "ネットワーク",IDC_LOGNETWORK,"Button",BS_AUTOCHECKBOX \|
147		- BS_PUSHLIKE \| WS_TABSTOP,185,279,35,11
148		- CONTROL "エラー",IDC_LOGERRORS,"Button",BS_AUTOCHECKBOX \|
149		- BS_PUSHLIKE \| WS_TABSTOP,159,279,25,11
150		- CONTROL "停止",IDC_CHECK9,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \|
151		- WS_TABSTOP,60,279,30,11
	131	+ CONTROL "デバッグ",IDC_LOGDEBUG,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,127,279,32,11
	132	+ CONTROL "ネットワーク",IDC_LOGNETWORK,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,185,279,35,11
	133	+ CONTROL "エラー",IDC_LOGERRORS,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,159,279,25,11
	134	+ CONTROL "停止",IDC_CHECK9,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,60,279,30,11
152	135	PUSHBUTTON "再生",IDC_BUTTON8,10,65,22,13
153		- CONTROL "チャンネル",IDC_LOGCHANNELS,"Button",BS_AUTOCHECKBOX \|
154		- BS_PUSHLIKE \| WS_TABSTOP,221,279,35,11
	136	+ CONTROL "チャンネル",IDC_LOGCHANNELS,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,221,279,35,11
155	137	PUSHBUTTON "再接続",IDC_BUTTON3,41,65,24,13
156	138	EDITTEXT IDC_EDIT9,33,159,261,14,ES_AUTOHSCROLL
157		- CONTROL "DJ",IDC_CHECK11,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \|
158		- WS_TABSTOP,5,160,23,12
	139	+ CONTROL "DJ",IDC_CHECK11,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,5,160,23,12
159	140	RTEXT "最大リレー数 :",IDC_STATIC,203,20,40,8
160	141	EDITTEXT IDC_MAXRELAYS,248,18,40,14,ES_AUTOHSCROLL \| ES_NUMBER
161	142	PUSHBUTTON "キープ",IDC_BUTTON9,112,65,24,13

		@@ -170,27 +151,20 @@ CAPTION "Channel Information"
170	151	FONT 9, "MS UI Gothic", 400, 0, 0x80
171	152	BEGIN
172	153	LTEXT "名前:",IDC_STATIC,7,8,24,9
173		- EDITTEXT IDC_EDIT_NAME,7,18,170,21,ES_MULTILINE \| ES_READONLY \|
174		- NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
	154	+ EDITTEXT IDC_EDIT_NAME,7,18,170,21,ES_MULTILINE \| ES_READONLY \| NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
175	155	LTEXT "内容:",IDC_STATIC,7,79,93,9
176		- EDITTEXT IDC_EDIT_PLAYING,8,90,170,21,ES_MULTILINE \| ES_READONLY \|
177		- NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
	156	+ EDITTEXT IDC_EDIT_PLAYING,8,90,170,21,ES_MULTILINE \| ES_READONLY \| NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
178	157	LTEXT "DJ メッセージ:",IDC_STATIC,7,117,41,9
179		- EDITTEXT IDC_EDIT_MESSAGE,8,128,170,21,ES_MULTILINE \| ES_READONLY \|
180		- NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
	158	+ EDITTEXT IDC_EDIT_MESSAGE,8,128,170,21,ES_MULTILINE \| ES_READONLY \| NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
181	159	PUSHBUTTON "URL",IDC_CONTACT,7,185,34,15,0,0,HIDC_CONTACT
182	160	LTEXT "詳細:",IDC_STATIC,7,43,67,8
183		- EDITTEXT IDC_EDIT_DESC,8,53,170,21,ES_MULTILINE \| ES_READONLY \|
184		- NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
	161	+ EDITTEXT IDC_EDIT_DESC,8,53,170,21,ES_MULTILINE \| ES_READONLY \| NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
185	162	RTEXT "形式",IDC_FORMAT,69,80,107,8
186	163	LTEXT "ジャンル:",IDC_STATIC,63,5,22,8
187		- EDITTEXT IDC_EDIT_GENRE,87,3,90,12,ES_AUTOHSCROLL \| ES_READONLY \|
188		- NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
189		- CONTROL "キープ",IDC_KEEP,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,
190		- 144,188,33,10
	164	+ EDITTEXT IDC_EDIT_GENRE,87,3,90,12,ES_AUTOHSCROLL \| ES_READONLY \| NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
	165	+ CONTROL "キープ",IDC_KEEP,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,144,188,33,10
191	166	LTEXT "ステータス:",IDC_STATIC,7,153,41,9
192		- EDITTEXT IDC_EDIT_STATUS,8,163,82,12,ES_READONLY \| NOT WS_BORDER \|
193		- NOT WS_TABSTOP,WS_EX_STATICEDGE
	167	+ EDITTEXT IDC_EDIT_STATUS,8,163,82,12,ES_READONLY \| NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
194	168	PUSHBUTTON "再生",IDC_PLAY,56,185,34,15
195	169	END
196	170

		@@ -259,8 +233,7 @@ IDR_VERMENU MENU
259	233	BEGIN
260	234	POPUP "popup"
261	235	BEGIN
262		- MENUITEM "Please upgrade PeerCast. Click here to download.",
263		- ID_POPUP_UPGRADE
	236	+ MENUITEM "Please upgrade PeerCast. Click here to download.", ID_POPUP_UPGRADE
264	237	END
265	238	END
266	239

		@@ -271,8 +244,7 @@ END
271	244	//
272	245
273	246	IDD_ABOUTBOX DIALOG 22, 17, 163, 59
274		-STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| DS_CENTER \| WS_CAPTION \|
275		- WS_SYSMENU
	247	+STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| DS_CENTER \| WS_CAPTION \| WS_SYSMENU
276	248	CAPTION "About"
277	249	FONT 8, "System"
278	250	BEGIN

--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj

+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj

		@@ -214,8 +214,8 @@
214	214	/>
215	215	<Tool
216	216	Name="VCPostBuildEventTool"
217		- Description="Copy exe to pimp & program files"
218		- CommandLine="copy release\peercast.exe "c:\program files\peercast" copy release\peercast.exe ..\pimp\ "
	217	+ Description="Copy exe to pimp"
	218	+ CommandLine="copy release\peercast.exe ..\pimp\ "
219	219	/>
220	220	</Configuration>
221	221	<Configuration

		@@ -902,5 +902,9 @@
902	902	</Filter>
903	903	</Files>
904	904	<Globals>
	905	+ <Global
	906	+ Name="RESOURCE_FILE"
	907	+ Value="Simple.rc"
	908	+ />
905	909	</Globals>
906	910	</VisualStudioProject>

--- a/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

+++ b/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

		@@ -446,6 +446,21 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
446	446	// 次の基点
447	447	origin.X += r1.Width;
448	448
	449	+ //// 上流IP/リスナー数/リレー数表示
	450	+ //// NOTE:
	451	+ //// ぴあかすの動作勉強用。リリースビルドでは元のコードを使用の事。
	452	+ //// 文字表示範囲は幅220ぐらいでおｋ
	453	+ //char tmp[512]; // 表示用バッファ
	454	+ //char hostip[256]; // IPアドレスバッファ
	455	+ //chDisp.uphost.toStr(hostip); // 上流IP
	456	+ //sprintf(tmp, "%d/%d - [%d/%d] - %s",
	457	+ // getTotalListeners(),
	458	+ // getTotalRelays(),
	459	+ // getLocalListeners(),
	460	+ // getLocalRelays(),
	461	+ // hostip
	462	+ // );
	463	+
449	464	// リスナー数/リレー数表示
450	465	char tmp[256];
451	466	sprintf(tmp, "%d/%d - [%d/%d]", getTotalListeners(), getTotalRelays(), getLocalListeners(), getLocalRelays());

		@@ -1342,6 +1357,12 @@ void PopupOtherMenu(){
1342	1357	}
1343	1358
1344	1359	void WmCreateProc(HWND hwnd){
	1360	+ // 自動最前面機能
	1361	+ if (servMgr->topmostGui)
	1362	+ {
	1363	+ ::gbDispTop = true;
	1364	+ }
	1365	+
1345	1366	if (backImage){
1346	1367	::delete backImage;
1347	1368	}

--- a/PeerCast.root/PeerCast/ui/win32/simple/resource.h

+++ b/PeerCast.root/PeerCast/ui/win32/simple/resource.h

		@@ -1,5 +1,5 @@
1	1	//{{NO_DEPENDENCIES}}
2		-// Microsoft Developer Studio generated include file.
	2	+// Microsoft Visual C++ generated include file.
3	3	// Used by Simple.rc
4	4	//
5	5	#define IDC_MYICON 2

		@@ -96,6 +96,11 @@
96	96	#define ID_POPUP_YELLOWPAGES2 32821
97	97	#define ID_POPUP_SAVE_GUI_POS 32823
98	98	#define ID_POPUP_KEEP_DOWNSTREAMS 32825
	99	+#define ID_Menu 32826
	100	+#define ID_Menu32827 32827
	101	+#define ID_POPUP_TOPMOST 32828
	102	+#define ID_32829 32829
	103	+#define ID_POPUP_START_WITH_GUI 32830
99	104	#define IDC_STATIC -1
100	105
101	106	// Next default values for new objects

		@@ -103,7 +108,7 @@
103	108	#ifdef APSTUDIO_INVOKED
104	109	#ifndef APSTUDIO_READONLY_SYMBOLS
105	110	#define _APS_NEXT_RESOURCE_VALUE 142
106		-#define _APS_NEXT_COMMAND_VALUE 32826
	111	+#define _APS_NEXT_COMMAND_VALUE 32831
107	112	#define _APS_NEXT_CONTROL_VALUE 1019
108	113	#define _APS_NEXT_SYMED_VALUE 110
109	114	#endif

--- a/c:/Git/PeerCast.root/PeerCast/core/common/servmgr.cpp

+++ b/c:/Git/PeerCast.root/PeerCast/core/common/servmgr.cpp

		@@ -138,6 +138,9 @@ ServMgr::ServMgr()
138	138	saveGuiPos = false;
139	139	keepDownstreams = true;
140	140
	141	+ topmostGui = false;
	142	+ startWithGui = false;
	143	+
141	144	chanLog="";
142	145
143	146	maxRelaysIndexTxt = 1; // for PCRaw (relay)

		@@ -1053,6 +1056,9 @@ void ServMgr::saveSettings(const char *fn)
1053	1056	iniFile.writeIntValue("guiLeft", winPlace.rcNormalPosition.left);
1054	1057	iniFile.writeIntValue("guiRight", winPlace.rcNormalPosition.right);
1055	1058	}
	1059	+
	1060	+ iniFile.writeBoolValue("topmostGui", servMgr->topmostGui);
	1061	+ iniFile.writeBoolValue("startWithGui", servMgr->startWithGui);
1056	1062	#endif
1057	1063	int i;
1058	1064

		@@ -1431,6 +1437,14 @@ void ServMgr::loadSettings(const char *fn)
1431	1437	guiFlg = true;
1432	1438	}
1433	1439	}
	1440	+
	1441	+ else if (iniFile.isName("topmostGui"))
	1442	+ {
	1443	+ servMgr->topmostGui = iniFile.getBoolValue();
	1444	+ } else if (iniFile.isName("startWithGui"))
	1445	+ {
	1446	+ servMgr->startWithGui = iniFile.getBoolValue();
	1447	+ }
1434	1448	#endif
1435	1449
1436	1450	// debug

--- a/c:/Git/PeerCast.root/PeerCast/core/common/servmgr.h

+++ b/c:/Git/PeerCast.root/PeerCast/core/common/servmgr.h

		@@ -416,6 +416,9 @@ public:
416	416	bool saveGuiPos;
417	417	bool keepDownstreams;
418	418
	419	+ bool topmostGui; // 最前面
	420	+ bool startWithGui; // 起動時にGUI
	421	+
419	422	int maxRelaysIndexTxt; // for PCRaw (relay)
420	423
421	424	private:

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp

		@@ -75,6 +75,9 @@ bool chanInfoIsRelayed;
75	75	String exePath;
76	76	ULONG_PTR gdiplusToken;
77	77
	78	+// プロトタイプ宣言
	79	+void createGUI(HWND);
	80	+
78	81	// ---------------------------------
79	82	Sys * APICALL MyPeercastInst::createSys()
80	83	{

		@@ -390,6 +393,11 @@ int APIENTRY WinMain(HINSTANCE hInstance,
390	393	if (mask & ServMgr::NT_TRACKINFO)
391	394	CheckMenuItem(trayMenu,ID_POPUP_SHOWMESSAGES_TRACKINFO,MF_CHECKED\|MF_BYCOMMAND);
392	395
	396	+ if (servMgr->startWithGui)
	397	+ {
	398	+ createGUI((HWND)0);
	399	+ }
	400	+
393	401	// Main message loop:
394	402	while (GetMessage(&msg, NULL, 0, 0))
395	403	{

		@@ -823,6 +831,12 @@ void createGUI(HWND hWnd)
823	831	NULL);
824	832	}
825	833	ShowWindow(guiWnd,SW_SHOWNORMAL);
	834	+
	835	+ // 自動で最前面
	836	+ if (servMgr->topmostGui)
	837	+ {
	838	+ ::SetWindowPos(guiWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE\|SWP_NOSIZE);
	839	+ }
826	840	}
827	841
828	842

		@@ -1046,6 +1060,23 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
1046	1060	CheckMenuItem(trayMenu, ID_POPUP_SAVE_GUI_POS, MF_UNCHECKED\|MF_BYCOMMAND);
1047	1061	}
1048	1062
	1063	+ // 自動GUI/最前面機能
	1064	+ if (servMgr->topmostGui)
	1065	+ {
	1066	+ CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_CHECKED\|MF_BYCOMMAND);
	1067	+ } else
	1068	+ {
	1069	+ CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_UNCHECKED\|MF_BYCOMMAND);
	1070	+ }
	1071	+
	1072	+ if (servMgr->startWithGui)
	1073	+ {
	1074	+ CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_CHECKED\|MF_BYCOMMAND);
	1075	+ } else
	1076	+ {
	1077	+ CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_UNCHECKED\|MF_BYCOMMAND);
	1078	+ }
	1079	+
1049	1080	SetForegroundWindow(hWnd);
1050	1081	bool skipMenu=false;
1051	1082

		@@ -1256,6 +1287,34 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
1256	1287	//peercastInst->saveSettings();
1257	1288	break;
1258	1289
	1290	+ case ID_POPUP_TOPMOST:
	1291	+ // 最前面表示
	1292	+ if (servMgr->topmostGui)
	1293	+ {
	1294	+ servMgr->topmostGui = false;
	1295	+ CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_UNCHECKED\|MF_BYCOMMAND);
	1296	+ } else
	1297	+ {
	1298	+ servMgr->topmostGui = true;
	1299	+ CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_CHECKED\|MF_BYCOMMAND);
	1300	+ }
	1301	+ peercastInst->saveSettings();
	1302	+ break;
	1303	+
	1304	+ case ID_POPUP_START_WITH_GUI:
	1305	+ // 起動時にGUI表示
	1306	+ if (servMgr->startWithGui)
	1307	+ {
	1308	+ servMgr->startWithGui = false;
	1309	+ CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_UNCHECKED\|MF_BYCOMMAND);
	1310	+ } else
	1311	+ {
	1312	+ servMgr->startWithGui = true;
	1313	+ CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_CHECKED\|MF_BYCOMMAND);
	1314	+ }
	1315	+ peercastInst->saveSettings();
	1316	+ break;
	1317	+
1259	1318	case ID_POPUP_EXIT_CONFIRM:
1260	1319	case IDM_EXIT:
1261	1320	DestroyWindow(hWnd);

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc

		@@ -38,47 +38,38 @@ IDR_TRAYMENU MENU
38	38	BEGIN
39	39	POPUP "popup"
40	40	BEGIN
41		- MENUITEM "情報", ID_POPUP_ABOUT
42		- MENUITEM "ヘルプ", ID_POPUP_HELP
	41	+ MENUITEM "情報", ID_POPUP_ABOUT
	42	+ MENUITEM "ヘルプ", ID_POPUP_HELP
43	43	MENUITEM SEPARATOR
44	44	POPUP "ポップアップメッセージ"
45	45	BEGIN
46	46	MENUITEM "PeerCast", ID_POPUP_SHOWMESSAGES_PEERCAST
47		-
48		- MENUITEM "配信者", ID_POPUP_SHOWMESSAGES_BROADCASTERS
49		-
50		- MENUITEM "トラック情報", ID_POPUP_SHOWMESSAGES_TRACKINFO
51		-
52		- MENUITEM "アップデート情報", ID_POPUP_POPUPMESSAGES_UPGRADEALERTS
53		- , CHECKED, GRAYED
	47	+ MENUITEM "配信者", ID_POPUP_SHOWMESSAGES_BROADCASTERS
	48	+ MENUITEM "トラック情報", ID_POPUP_SHOWMESSAGES_TRACKINFO
	49	+ MENUITEM "アップデート情報", ID_POPUP_POPUPMESSAGES_UPGRADEALERTS, CHECKED, GRAYED
54	50	END
55	51	POPUP "高度"
56	52	BEGIN
57		- MENUITEM "情報", ID_POPUP_ADVANCED_INFORMATION
58		-
59		- MENUITEM "リレーチャンネル", ID_POPUP_ADVANCED_RELAYEDCHANNELS
60		-
61		- MENUITEM "配信", ID_POPUP_ADVANCED_BROADCAST
62		-
63		- MENUITEM "コネクション", ID_POPUP_CONNECTIONS
64		- MENUITEM "ログ", ID_POPUP_ADVANCED_VIEWLOG
65		-
66		- MENUITEM "設定", ID_POPUP_SETTINGS
67		- MENUITEM "GUIを開く", ID_POPUP_ADVANCED_SHOWGUI
68		-
	53	+ MENUITEM "情報", ID_POPUP_ADVANCED_INFORMATION
	54	+ MENUITEM "リレーチャンネル", ID_POPUP_ADVANCED_RELAYEDCHANNELS
	55	+ MENUITEM "配信", ID_POPUP_ADVANCED_BROADCAST
	56	+ MENUITEM "コネクション", ID_POPUP_CONNECTIONS
	57	+ MENUITEM "ログ", ID_POPUP_ADVANCED_VIEWLOG
	58	+ MENUITEM "設定", ID_POPUP_SETTINGS
	59	+ MENUITEM "GUIを開く", ID_POPUP_ADVANCED_SHOWGUI
69	60	END
70	61	POPUP "追加設定"
71	62	BEGIN
72		- MENUITEM "終了時、表示位置を保存", ID_POPUP_SAVE_GUI_POS
73		- , CHECKED
74		- MENUITEM "再接続時下流維持", ID_POPUP_KEEP_DOWNSTREAMS
75		- , CHECKED
	63	+ MENUITEM "終了時、表示位置を保存", ID_POPUP_SAVE_GUI_POS, CHECKED
	64	+ MENUITEM "再接続時下流維持", ID_POPUP_SHOWGUI, CHECKED
	65	+ MENUITEM "常に手前に表示", ID_POPUP_TOPMOST
	66	+ MENUITEM "起動時、GUIを表示", ID_POPUP_START_WITH_GUI
76	67	END
77	68	MENUITEM SEPARATOR
78	69	POPUP "終了"
79	70	BEGIN
80		- MENUITEM "はい", ID_POPUP_EXIT_CONFIRM
81		- MENUITEM "いいえ", ID_POPUP_EXIT_NO
	71	+ MENUITEM "はい", ID_POPUP_EXIT_CONFIRM
	72	+ MENUITEM "いいえ", ID_POPUP_EXIT_NO
82	73	END
83	74	END
84	75	END

		@@ -88,7 +79,7 @@ BEGIN
88	79	POPUP "popup"
89	80	BEGIN
90	81	MENUITEM SEPARATOR
91		- MENUITEM "イエローページ", ID_POPUP_YELLOWPAGES
	82	+ MENUITEM "イエローページ", ID_POPUP_YELLOWPAGES
92	83	POPUP "イエローページ"
93	84	BEGIN
94	85	MENUITEM "AAA", ID_POPUP_YELLOWPAGES1

		@@ -97,7 +88,7 @@ BEGIN
97	88	END
98	89	END
99	90
100		-IDR_GUIMENU MENU
	91	+IDR_GUIMENU MENU
101	92	BEGIN
102	93	POPUP "popup"
103	94	BEGIN

		@@ -111,51 +102,41 @@ BEGIN
111	102	END
112	103	END
113	104
	105	+
114	106	/////////////////////////////////////////////////////////////////////////////
115	107	//
116	108	// Dialog
117	109	//
118	110
119	111	IDD_MAINWINDOW DIALOGEX 0, 0, 298, 341
120		-STYLE DS_SETFONT \| DS_CENTER \| WS_MINIMIZEBOX \| WS_CAPTION \| WS_SYSMENU \|
121		- WS_THICKFRAME
	112	+STYLE DS_SETFONT \| DS_CENTER \| WS_MINIMIZEBOX \| WS_CAPTION \| WS_SYSMENU \| WS_THICKFRAME
122	113	EXSTYLE WS_EX_APPWINDOW
123	114	CAPTION "PeerCast"
124	115	FONT 9, "MS UI Gothic", 0, 0, 0x1
125	116	BEGIN
126		- LISTBOX IDC_LIST1,3,291,291,43,LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \|
127		- WS_TABSTOP
128		- CONTROL "有効",IDC_CHECK1,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \|
129		- WS_TABSTOP,9,29,60,20,WS_EX_TRANSPARENT
	117	+ LISTBOX IDC_LIST1,3,291,291,43,LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	118	+ CONTROL "有効",IDC_CHECK1,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,9,29,60,20,WS_EX_TRANSPARENT
130	119	EDITTEXT IDC_EDIT1,127,18,47,12,ES_AUTOHSCROLL
131	120	RTEXT "ポート :",IDC_STATIC,107,20,18,8
132		- LISTBOX IDC_LIST2,3,206,291,71,LBS_OWNERDRAWFIXED \|
133		- LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	121	+ LISTBOX IDC_LIST2,3,206,291,71,LBS_OWNERDRAWFIXED \| LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
134	122	LTEXT "ログ",IDC_STATIC_LOG,3,282,13,8
135	123	LTEXT "コネクション",IDC_STATIC_CONNECTION,3,184,40,8
136	124	GROUPBOX "",IDC_STATIC,3,4,291,49
137	125	PUSHBUTTON "クリア",IDC_BUTTON1,35,279,25,11
138		- LISTBOX IDC_LIST3,3,81,291,67,LBS_OWNERDRAWFIXED \|
139		- LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
	126	+ LISTBOX IDC_LIST3,3,81,291,67,LBS_OWNERDRAWFIXED \| LBS_NOINTEGRALHEIGHT \| WS_VSCROLL \| WS_TABSTOP
140	127	PUSHBUTTON "切断",IDC_BUTTON5,67,65,43,13
141	128	GROUPBOX "リレー",IDC_GROUPBOX_RELAY,3,54,291,96
142	129	EDITTEXT IDC_EDIT3,127,34,47,12,ES_PASSWORD \| ES_AUTOHSCROLL
143	130	RTEXT "パスワード :",IDC_STATIC,89,36,36,8
144		- CONTROL "デバッグ",IDC_LOGDEBUG,"Button",BS_AUTOCHECKBOX \|
145		- BS_PUSHLIKE \| WS_TABSTOP,127,279,32,11
146		- CONTROL "ネットワーク",IDC_LOGNETWORK,"Button",BS_AUTOCHECKBOX \|
147		- BS_PUSHLIKE \| WS_TABSTOP,185,279,35,11
148		- CONTROL "エラー",IDC_LOGERRORS,"Button",BS_AUTOCHECKBOX \|
149		- BS_PUSHLIKE \| WS_TABSTOP,159,279,25,11
150		- CONTROL "停止",IDC_CHECK9,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \|
151		- WS_TABSTOP,60,279,30,11
	131	+ CONTROL "デバッグ",IDC_LOGDEBUG,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,127,279,32,11
	132	+ CONTROL "ネットワーク",IDC_LOGNETWORK,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,185,279,35,11
	133	+ CONTROL "エラー",IDC_LOGERRORS,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,159,279,25,11
	134	+ CONTROL "停止",IDC_CHECK9,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,60,279,30,11
152	135	PUSHBUTTON "再生",IDC_BUTTON8,10,65,22,13
153		- CONTROL "チャンネル",IDC_LOGCHANNELS,"Button",BS_AUTOCHECKBOX \|
154		- BS_PUSHLIKE \| WS_TABSTOP,221,279,35,11
	136	+ CONTROL "チャンネル",IDC_LOGCHANNELS,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,221,279,35,11
155	137	PUSHBUTTON "再接続",IDC_BUTTON3,41,65,24,13
156	138	EDITTEXT IDC_EDIT9,33,159,261,14,ES_AUTOHSCROLL
157		- CONTROL "DJ",IDC_CHECK11,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \|
158		- WS_TABSTOP,5,160,23,12
	139	+ CONTROL "DJ",IDC_CHECK11,"Button",BS_AUTOCHECKBOX \| BS_PUSHLIKE \| WS_TABSTOP,5,160,23,12
159	140	RTEXT "最大リレー数 :",IDC_STATIC,203,20,40,8
160	141	EDITTEXT IDC_MAXRELAYS,248,18,40,14,ES_AUTOHSCROLL \| ES_NUMBER
161	142	PUSHBUTTON "キープ",IDC_BUTTON9,112,65,24,13

		@@ -170,27 +151,20 @@ CAPTION "Channel Information"
170	151	FONT 9, "MS UI Gothic", 400, 0, 0x80
171	152	BEGIN
172	153	LTEXT "名前:",IDC_STATIC,7,8,24,9
173		- EDITTEXT IDC_EDIT_NAME,7,18,170,21,ES_MULTILINE \| ES_READONLY \|
174		- NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
	154	+ EDITTEXT IDC_EDIT_NAME,7,18,170,21,ES_MULTILINE \| ES_READONLY \| NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
175	155	LTEXT "内容:",IDC_STATIC,7,79,93,9
176		- EDITTEXT IDC_EDIT_PLAYING,8,90,170,21,ES_MULTILINE \| ES_READONLY \|
177		- NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
	156	+ EDITTEXT IDC_EDIT_PLAYING,8,90,170,21,ES_MULTILINE \| ES_READONLY \| NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
178	157	LTEXT "DJ メッセージ:",IDC_STATIC,7,117,41,9
179		- EDITTEXT IDC_EDIT_MESSAGE,8,128,170,21,ES_MULTILINE \| ES_READONLY \|
180		- NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
	158	+ EDITTEXT IDC_EDIT_MESSAGE,8,128,170,21,ES_MULTILINE \| ES_READONLY \| NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
181	159	PUSHBUTTON "URL",IDC_CONTACT,7,185,34,15,0,0,HIDC_CONTACT
182	160	LTEXT "詳細:",IDC_STATIC,7,43,67,8
183		- EDITTEXT IDC_EDIT_DESC,8,53,170,21,ES_MULTILINE \| ES_READONLY \|
184		- NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
	161	+ EDITTEXT IDC_EDIT_DESC,8,53,170,21,ES_MULTILINE \| ES_READONLY \| NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
185	162	RTEXT "形式",IDC_FORMAT,69,80,107,8
186	163	LTEXT "ジャンル:",IDC_STATIC,63,5,22,8
187		- EDITTEXT IDC_EDIT_GENRE,87,3,90,12,ES_AUTOHSCROLL \| ES_READONLY \|
188		- NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
189		- CONTROL "キープ",IDC_KEEP,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,
190		- 144,188,33,10
	164	+ EDITTEXT IDC_EDIT_GENRE,87,3,90,12,ES_AUTOHSCROLL \| ES_READONLY \| NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
	165	+ CONTROL "キープ",IDC_KEEP,"Button",BS_AUTOCHECKBOX \| WS_TABSTOP,144,188,33,10
191	166	LTEXT "ステータス:",IDC_STATIC,7,153,41,9
192		- EDITTEXT IDC_EDIT_STATUS,8,163,82,12,ES_READONLY \| NOT WS_BORDER \|
193		- NOT WS_TABSTOP,WS_EX_STATICEDGE
	167	+ EDITTEXT IDC_EDIT_STATUS,8,163,82,12,ES_READONLY \| NOT WS_BORDER \| NOT WS_TABSTOP,WS_EX_STATICEDGE
194	168	PUSHBUTTON "再生",IDC_PLAY,56,185,34,15
195	169	END
196	170

		@@ -259,8 +233,7 @@ IDR_VERMENU MENU
259	233	BEGIN
260	234	POPUP "popup"
261	235	BEGIN
262		- MENUITEM "Please upgrade PeerCast. Click here to download.",
263		- ID_POPUP_UPGRADE
	236	+ MENUITEM "Please upgrade PeerCast. Click here to download.", ID_POPUP_UPGRADE
264	237	END
265	238	END
266	239

		@@ -271,8 +244,7 @@ END
271	244	//
272	245
273	246	IDD_ABOUTBOX DIALOG 22, 17, 163, 59
274		-STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| DS_CENTER \| WS_CAPTION \|
275		- WS_SYSMENU
	247	+STYLE DS_SETFONT \| DS_MODALFRAME \| DS_SETFOREGROUND \| DS_CENTER \| WS_CAPTION \| WS_SYSMENU
276	248	CAPTION "About"
277	249	FONT 8, "System"
278	250	BEGIN

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj

		@@ -214,8 +214,8 @@
214	214	/>
215	215	<Tool
216	216	Name="VCPostBuildEventTool"
217		- Description="Copy exe to pimp & program files"
218		- CommandLine="copy release\peercast.exe "c:\program files\peercast" copy release\peercast.exe ..\pimp\ "
	217	+ Description="Copy exe to pimp"
	218	+ CommandLine="copy release\peercast.exe ..\pimp\ "
219	219	/>
220	220	</Configuration>
221	221	<Configuration

		@@ -902,5 +902,9 @@
902	902	</Filter>
903	903	</Files>
904	904	<Globals>
	905	+ <Global
	906	+ Name="RESOURCE_FILE"
	907	+ Value="Simple.rc"
	908	+ />
905	909	</Globals>
906	910	</VisualStudioProject>

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

		@@ -446,6 +446,21 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
446	446	// 次の基点
447	447	origin.X += r1.Width;
448	448
	449	+ //// 上流IP/リスナー数/リレー数表示
	450	+ //// NOTE:
	451	+ //// ぴあかすの動作勉強用。リリースビルドでは元のコードを使用の事。
	452	+ //// 文字表示範囲は幅220ぐらいでおｋ
	453	+ //char tmp[512]; // 表示用バッファ
	454	+ //char hostip[256]; // IPアドレスバッファ
	455	+ //chDisp.uphost.toStr(hostip); // 上流IP
	456	+ //sprintf(tmp, "%d/%d - [%d/%d] - %s",
	457	+ // getTotalListeners(),
	458	+ // getTotalRelays(),
	459	+ // getLocalListeners(),
	460	+ // getLocalRelays(),
	461	+ // hostip
	462	+ // );
	463	+
449	464	// リスナー数/リレー数表示
450	465	char tmp[256];
451	466	sprintf(tmp, "%d/%d - [%d/%d]", getTotalListeners(), getTotalRelays(), getLocalListeners(), getLocalRelays());

		@@ -1342,6 +1357,12 @@ void PopupOtherMenu(){
1342	1357	}
1343	1358
1344	1359	void WmCreateProc(HWND hwnd){
	1360	+ // 自動最前面機能
	1361	+ if (servMgr->topmostGui)
	1362	+ {
	1363	+ ::gbDispTop = true;
	1364	+ }
	1365	+
1345	1366	if (backImage){
1346	1367	::delete backImage;
1347	1368	}

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/resource.h

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/resource.h

		@@ -1,5 +1,5 @@
1	1	//{{NO_DEPENDENCIES}}
2		-// Microsoft Developer Studio generated include file.
	2	+// Microsoft Visual C++ generated include file.
3	3	// Used by Simple.rc
4	4	//
5	5	#define IDC_MYICON 2

		@@ -96,6 +96,11 @@
96	96	#define ID_POPUP_YELLOWPAGES2 32821
97	97	#define ID_POPUP_SAVE_GUI_POS 32823
98	98	#define ID_POPUP_KEEP_DOWNSTREAMS 32825
	99	+#define ID_Menu 32826
	100	+#define ID_Menu32827 32827
	101	+#define ID_POPUP_TOPMOST 32828
	102	+#define ID_32829 32829
	103	+#define ID_POPUP_START_WITH_GUI 32830
99	104	#define IDC_STATIC -1
100	105
101	106	// Next default values for new objects

		@@ -103,7 +108,7 @@
103	108	#ifdef APSTUDIO_INVOKED
104	109	#ifndef APSTUDIO_READONLY_SYMBOLS
105	110	#define _APS_NEXT_RESOURCE_VALUE 142
106		-#define _APS_NEXT_COMMAND_VALUE 32826
	111	+#define _APS_NEXT_COMMAND_VALUE 32831
107	112	#define _APS_NEXT_CONTROL_VALUE 1019
108	113	#define _APS_NEXT_SYMED_VALUE 110
109	114	#endif

Show on old repository browser