起動時にGUI表示

GUIを自動で最前面機能追加

diff --git a/PeerCast.root/PeerCast/core/common/servmgr.cpp b/PeerCast.root/PeerCast/core/common/servmgr.cpp
index d7bbbe7..e8d57e2 100644 (file)
--- a/PeerCast.root/PeerCast/core/common/servmgr.cpp
+++ b/PeerCast.root/PeerCast/core/common/servmgr.cpp
@@ -138,6 +138,9 @@ ServMgr::ServMgr()
        saveGuiPos = false;
        keepDownstreams = true;
 
+       topmostGui = false;
+       startWithGui = false;
+
        chanLog="";
 
        maxRelaysIndexTxt = 1;  // for PCRaw (relay)
@@ -1053,6 +1056,9 @@ void ServMgr::saveSettings(const char *fn)
                        iniFile.writeIntValue("guiLeft", winPlace.rcNormalPosition.left);
                        iniFile.writeIntValue("guiRight", winPlace.rcNormalPosition.right);
                }
+
+               iniFile.writeBoolValue("topmostGui", servMgr->topmostGui);
+               iniFile.writeBoolValue("startWithGui", servMgr->startWithGui);
 #endif
                int i;
 
@@ -1431,6 +1437,14 @@ void ServMgr::loadSettings(const char *fn)
                                        guiFlg = true;
                                }
                        }
+
+                       else if (iniFile.isName("topmostGui"))
+                       {
+                               servMgr->topmostGui = iniFile.getBoolValue();
+                       } else if (iniFile.isName("startWithGui"))
+                       {
+                               servMgr->startWithGui = iniFile.getBoolValue();
+                       }
 #endif
 
                        // debug

diff --git a/PeerCast.root/PeerCast/core/common/servmgr.h b/PeerCast.root/PeerCast/core/common/servmgr.h
index fa8e721..f8832fc 100644 (file)
--- a/PeerCast.root/PeerCast/core/common/servmgr.h
+++ b/PeerCast.root/PeerCast/core/common/servmgr.h
@@ -416,6 +416,9 @@ public:
        bool    saveGuiPos;
        bool    keepDownstreams;
 
+       bool topmostGui; // \8dÅ\91O\96Ê
+       bool startWithGui; // \8bN\93®\8e\9e\82ÉGUI
+
        int maxRelaysIndexTxt;  // for PCRaw (relay)
 
 private:

diff --git a/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp b/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp
index 61c03f0..a71eed7 100644 (file)
--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp
+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp
@@ -75,6 +75,9 @@ bool chanInfoIsRelayed;
 String exePath;
 ULONG_PTR gdiplusToken;
 
+// \83v\83\8d\83g\83^\83C\83v\90é\8c¾
+void createGUI(HWND);
+
 // ---------------------------------
 Sys * APICALL MyPeercastInst::createSys()
 {
@@ -390,6 +393,11 @@ int APIENTRY WinMain(HINSTANCE hInstance,
        if (mask & ServMgr::NT_TRACKINFO)
                CheckMenuItem(trayMenu,ID_POPUP_SHOWMESSAGES_TRACKINFO,MF_CHECKED|MF_BYCOMMAND);
 
+       if (servMgr->startWithGui)
+       {
+               createGUI((HWND)0);
+       }
+
        // Main message loop:
        while (GetMessage(&msg, NULL, 0, 0)) 
        {
@@ -823,6 +831,12 @@ void createGUI(HWND hWnd)
                        NULL);
        }
        ShowWindow(guiWnd,SW_SHOWNORMAL);
+
+       // \8e©\93®\82Å\8dÅ\91O\96Ê
+       if (servMgr->topmostGui)
+       {
+               ::SetWindowPos(guiWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
+       }
 }
 
 
@@ -1046,6 +1060,23 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                                        CheckMenuItem(trayMenu, ID_POPUP_SAVE_GUI_POS, MF_UNCHECKED|MF_BYCOMMAND);
                                }
 
+                               // \8e©\93®GUI/\8dÅ\91O\96Ê\8b@\94\
+                               if (servMgr->topmostGui)
+                               {
+                                       CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_CHECKED|MF_BYCOMMAND);
+                               } else
+                               {
+                                       CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_UNCHECKED|MF_BYCOMMAND);
+                               }
+
+                               if (servMgr->startWithGui)
+                               {
+                                       CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_CHECKED|MF_BYCOMMAND);
+                               } else
+                               {
+                                       CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_UNCHECKED|MF_BYCOMMAND);
+                               }
+
                                SetForegroundWindow(hWnd);    
                                bool skipMenu=false;
 
@@ -1256,6 +1287,34 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                                        //peercastInst->saveSettings();
                                        break;
 
+                               case ID_POPUP_TOPMOST:
+                                       // \8dÅ\91O\96Ê\95\\8e¦
+                                       if (servMgr->topmostGui)
+                                       {
+                                               servMgr->topmostGui = false;
+                                               CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_UNCHECKED|MF_BYCOMMAND);
+                                       } else
+                                       {
+                                               servMgr->topmostGui = true;
+                                               CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_CHECKED|MF_BYCOMMAND);
+                                       }
+                                       peercastInst->saveSettings();
+                                       break;
+
+                               case ID_POPUP_START_WITH_GUI:
+                                       // \8bN\93®\8e\9e\82ÉGUI\95\\8e¦
+                                       if (servMgr->startWithGui)
+                                       {
+                                               servMgr->startWithGui = false;
+                                               CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_UNCHECKED|MF_BYCOMMAND);
+                                       } else
+                                       {
+                                               servMgr->startWithGui = true;
+                                               CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_CHECKED|MF_BYCOMMAND);
+                                       }
+                                       peercastInst->saveSettings();
+                                       break;
+
                                case ID_POPUP_EXIT_CONFIRM:
                                case IDM_EXIT:
                                   DestroyWindow(hWnd);

diff --git a/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc b/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc
index 311c8fc..e65b7f7 100644 (file)
--- 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
 BEGIN
     POPUP "popup"
     BEGIN
-        MENUITEM "\8fî\95ñ",                        ID_POPUP_ABOUT
-        MENUITEM "\83w\83\8b\83v",                      ID_POPUP_HELP
+        MENUITEM "\8fî\95ñ",                          ID_POPUP_ABOUT
+        MENUITEM "\83w\83\8b\83v",                         ID_POPUP_HELP
         MENUITEM SEPARATOR
         POPUP "\83|\83b\83v\83A\83b\83v\83\81\83b\83Z\81[\83W"
         BEGIN
             MENUITEM "PeerCast",                    ID_POPUP_SHOWMESSAGES_PEERCAST
-
-            MENUITEM "\94z\90M\8eÒ",                      ID_POPUP_SHOWMESSAGES_BROADCASTERS
-
-            MENUITEM "\83g\83\89\83b\83N\8fî\95ñ",                ID_POPUP_SHOWMESSAGES_TRACKINFO
-
-            MENUITEM "\83A\83b\83v\83f\81[\83g\8fî\95ñ",            ID_POPUP_POPUPMESSAGES_UPGRADEALERTS
-            , CHECKED, GRAYED
+            MENUITEM "\94z\90M\8eÒ",                         ID_POPUP_SHOWMESSAGES_BROADCASTERS
+            MENUITEM "\83g\83\89\83b\83N\8fî\95ñ",                      ID_POPUP_SHOWMESSAGES_TRACKINFO
+            MENUITEM "\83A\83b\83v\83f\81[\83g\8fî\95ñ",                    ID_POPUP_POPUPMESSAGES_UPGRADEALERTS, CHECKED, GRAYED
         END
         POPUP "\8d\82\93x"
         BEGIN
-            MENUITEM "\8fî\95ñ",                        ID_POPUP_ADVANCED_INFORMATION
-
-            MENUITEM "\83\8a\83\8c\81[\83`\83\83\83\93\83l\83\8b",            ID_POPUP_ADVANCED_RELAYEDCHANNELS
-
-            MENUITEM "\94z\90M",                        ID_POPUP_ADVANCED_BROADCAST
-
-            MENUITEM "\83R\83l\83N\83V\83\87\83\93",                ID_POPUP_CONNECTIONS
-            MENUITEM "\83\8d\83O",                        ID_POPUP_ADVANCED_VIEWLOG
-
-            MENUITEM "\90Ý\92è",                        ID_POPUP_SETTINGS
-            MENUITEM "GUI\82ð\8aJ\82­",                   ID_POPUP_ADVANCED_SHOWGUI
-
+            MENUITEM "\8fî\95ñ",                          ID_POPUP_ADVANCED_INFORMATION
+            MENUITEM "\83\8a\83\8c\81[\83`\83\83\83\93\83l\83\8b",                    ID_POPUP_ADVANCED_RELAYEDCHANNELS
+            MENUITEM "\94z\90M",                          ID_POPUP_ADVANCED_BROADCAST
+            MENUITEM "\83R\83l\83N\83V\83\87\83\93",                      ID_POPUP_CONNECTIONS
+            MENUITEM "\83\8d\83O",                          ID_POPUP_ADVANCED_VIEWLOG
+            MENUITEM "\90Ý\92è",                          ID_POPUP_SETTINGS
+            MENUITEM "GUI\82ð\8aJ\82­",                      ID_POPUP_ADVANCED_SHOWGUI
         END
         POPUP "\92Ç\89Á\90Ý\92è"
         BEGIN
-            MENUITEM "\8fI\97¹\8e\9e\81A\95\\8e¦\88Ê\92u\82ð\95Û\91¶",      ID_POPUP_SAVE_GUI_POS
-            , CHECKED
-            MENUITEM "\8dÄ\90Ú\91±\8e\9e\89º\97¬\88Û\8e\9d",            ID_POPUP_KEEP_DOWNSTREAMS
-            , CHECKED
+            MENUITEM "\8fI\97¹\8e\9e\81A\95\\8e¦\88Ê\92u\82ð\95Û\91¶",                 ID_POPUP_SAVE_GUI_POS, CHECKED
+            MENUITEM "\8dÄ\90Ú\91±\8e\9e\89º\97¬\88Û\8e\9d",                    ID_POPUP_SHOWGUI, CHECKED
+            MENUITEM "\8fí\82É\8eè\91O\82É\95\\8e¦",                     ID_POPUP_TOPMOST
+            MENUITEM "\8bN\93®\8e\9e\81AGUI\82ð\95\\8e¦",                  ID_POPUP_START_WITH_GUI
         END
         MENUITEM SEPARATOR
         POPUP "\8fI\97¹"
         BEGIN
-            MENUITEM "\82Í\82¢",                        ID_POPUP_EXIT_CONFIRM
-            MENUITEM "\82¢\82¢\82¦",                      ID_POPUP_EXIT_NO
+            MENUITEM "\82Í\82¢",                          ID_POPUP_EXIT_CONFIRM
+            MENUITEM "\82¢\82¢\82¦",                         ID_POPUP_EXIT_NO
         END
     END
 END
@@ -88,7 +79,7 @@ BEGIN
     POPUP "popup"
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "\83C\83G\83\8d\81[\83y\81[\83W",              ID_POPUP_YELLOWPAGES
+        MENUITEM "\83C\83G\83\8d\81[\83y\81[\83W",                     ID_POPUP_YELLOWPAGES
         POPUP "\83C\83G\83\8d\81[\83y\81[\83W"
         BEGIN
             MENUITEM "AAA",                         ID_POPUP_YELLOWPAGES1
@@ -97,7 +88,7 @@ BEGIN
     END
 END
 
-IDR_GUIMENU MENU
+IDR_GUIMENU MENU 
 BEGIN
     POPUP "popup"
     BEGIN
@@ -111,51 +102,41 @@ BEGIN
     END
 END
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 
 IDD_MAINWINDOW DIALOGEX 0, 0, 298, 341
-STYLE DS_SETFONT | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU | 
-    WS_THICKFRAME
+STYLE DS_SETFONT | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "PeerCast"
 FONT 9, "MS UI Gothic", 0, 0, 0x1
 BEGIN
-    LISTBOX         IDC_LIST1,3,291,291,43,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "\97L\8cø",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | 
-                    WS_TABSTOP,9,29,60,20,WS_EX_TRANSPARENT
+    LISTBOX         IDC_LIST1,3,291,291,43,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "\97L\8cø",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,9,29,60,20,WS_EX_TRANSPARENT
     EDITTEXT        IDC_EDIT1,127,18,47,12,ES_AUTOHSCROLL
     RTEXT           "\83|\81[\83g :",IDC_STATIC,107,20,18,8
-    LISTBOX         IDC_LIST2,3,206,291,71,LBS_OWNERDRAWFIXED | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    LISTBOX         IDC_LIST2,3,206,291,71,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "\83\8d\83O",IDC_STATIC_LOG,3,282,13,8
     LTEXT           "\83R\83l\83N\83V\83\87\83\93",IDC_STATIC_CONNECTION,3,184,40,8
     GROUPBOX        "",IDC_STATIC,3,4,291,49
     PUSHBUTTON      "\83N\83\8a\83A",IDC_BUTTON1,35,279,25,11
-    LISTBOX         IDC_LIST3,3,81,291,67,LBS_OWNERDRAWFIXED | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    LISTBOX         IDC_LIST3,3,81,291,67,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "\90Ø\92f",IDC_BUTTON5,67,65,43,13
     GROUPBOX        "\83\8a\83\8c\81[",IDC_GROUPBOX_RELAY,3,54,291,96
     EDITTEXT        IDC_EDIT3,127,34,47,12,ES_PASSWORD | ES_AUTOHSCROLL
     RTEXT           "\83p\83X\83\8f\81[\83h :",IDC_STATIC,89,36,36,8
-    CONTROL         "\83f\83o\83b\83O",IDC_LOGDEBUG,"Button",BS_AUTOCHECKBOX | 
-                    BS_PUSHLIKE | WS_TABSTOP,127,279,32,11
-    CONTROL         "\83l\83b\83g\83\8f\81[\83N",IDC_LOGNETWORK,"Button",BS_AUTOCHECKBOX | 
-                    BS_PUSHLIKE | WS_TABSTOP,185,279,35,11
-    CONTROL         "\83G\83\89\81[",IDC_LOGERRORS,"Button",BS_AUTOCHECKBOX | 
-                    BS_PUSHLIKE | WS_TABSTOP,159,279,25,11
-    CONTROL         "\92â\8e~",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | 
-                    WS_TABSTOP,60,279,30,11
+    CONTROL         "\83f\83o\83b\83O",IDC_LOGDEBUG,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,127,279,32,11
+    CONTROL         "\83l\83b\83g\83\8f\81[\83N",IDC_LOGNETWORK,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,185,279,35,11
+    CONTROL         "\83G\83\89\81[",IDC_LOGERRORS,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,159,279,25,11
+    CONTROL         "\92â\8e~",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,60,279,30,11
     PUSHBUTTON      "\8dÄ\90¶",IDC_BUTTON8,10,65,22,13
-    CONTROL         "\83`\83\83\83\93\83l\83\8b",IDC_LOGCHANNELS,"Button",BS_AUTOCHECKBOX | 
-                    BS_PUSHLIKE | WS_TABSTOP,221,279,35,11
+    CONTROL         "\83`\83\83\83\93\83l\83\8b",IDC_LOGCHANNELS,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,221,279,35,11
     PUSHBUTTON      "\8dÄ\90Ú\91±",IDC_BUTTON3,41,65,24,13
     EDITTEXT        IDC_EDIT9,33,159,261,14,ES_AUTOHSCROLL
-    CONTROL         "DJ",IDC_CHECK11,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | 
-                    WS_TABSTOP,5,160,23,12
+    CONTROL         "DJ",IDC_CHECK11,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,5,160,23,12
     RTEXT           "\8dÅ\91å\83\8a\83\8c\81[\90\94 :",IDC_STATIC,203,20,40,8
     EDITTEXT        IDC_MAXRELAYS,248,18,40,14,ES_AUTOHSCROLL | ES_NUMBER
     PUSHBUTTON      "\83L\81[\83v",IDC_BUTTON9,112,65,24,13
@@ -170,27 +151,20 @@ CAPTION "Channel Information"
 FONT 9, "MS UI Gothic", 400, 0, 0x80
 BEGIN
     LTEXT           "\96¼\91O:",IDC_STATIC,7,8,24,9
-    EDITTEXT        IDC_EDIT_NAME,7,18,170,21,ES_MULTILINE | ES_READONLY | 
-                    NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
+    EDITTEXT        IDC_EDIT_NAME,7,18,170,21,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
     LTEXT           "\93à\97e:",IDC_STATIC,7,79,93,9
-    EDITTEXT        IDC_EDIT_PLAYING,8,90,170,21,ES_MULTILINE | ES_READONLY | 
-                    NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
+    EDITTEXT        IDC_EDIT_PLAYING,8,90,170,21,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
     LTEXT           "DJ \83\81\83b\83Z\81[\83W:",IDC_STATIC,7,117,41,9
-    EDITTEXT        IDC_EDIT_MESSAGE,8,128,170,21,ES_MULTILINE | ES_READONLY | 
-                    NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
+    EDITTEXT        IDC_EDIT_MESSAGE,8,128,170,21,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
     PUSHBUTTON      "URL",IDC_CONTACT,7,185,34,15,0,0,HIDC_CONTACT
     LTEXT           "\8fÚ\8d×:",IDC_STATIC,7,43,67,8
-    EDITTEXT        IDC_EDIT_DESC,8,53,170,21,ES_MULTILINE | ES_READONLY | 
-                    NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
+    EDITTEXT        IDC_EDIT_DESC,8,53,170,21,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
     RTEXT           "\8c`\8e®",IDC_FORMAT,69,80,107,8
     LTEXT           "\83W\83\83\83\93\83\8b:",IDC_STATIC,63,5,22,8
-    EDITTEXT        IDC_EDIT_GENRE,87,3,90,12,ES_AUTOHSCROLL | ES_READONLY | 
-                    NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
-    CONTROL         "\83L\81[\83v",IDC_KEEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    144,188,33,10
+    EDITTEXT        IDC_EDIT_GENRE,87,3,90,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
+    CONTROL         "\83L\81[\83v",IDC_KEEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,144,188,33,10
     LTEXT           "\83X\83e\81[\83^\83X:",IDC_STATIC,7,153,41,9
-    EDITTEXT        IDC_EDIT_STATUS,8,163,82,12,ES_READONLY | NOT WS_BORDER | 
-                    NOT WS_TABSTOP,WS_EX_STATICEDGE
+    EDITTEXT        IDC_EDIT_STATUS,8,163,82,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
     PUSHBUTTON      "\8dÄ\90¶",IDC_PLAY,56,185,34,15
 END
 
@@ -259,8 +233,7 @@ IDR_VERMENU MENU
 BEGIN
     POPUP "popup"
     BEGIN
-        MENUITEM "Please upgrade PeerCast. Click here to download.", 
-                                                ID_POPUP_UPGRADE
+        MENUITEM "Please upgrade PeerCast. Click here to download.", ID_POPUP_UPGRADE
     END
 END
 
@@ -271,8 +244,7 @@ END
 //
 
 IDD_ABOUTBOX DIALOG  22, 17, 163, 59
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
 FONT 8, "System"
 BEGIN

diff --git a/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj b/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
index f161204..4102c17 100644 (file)
--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
@@ -214,8 +214,8 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
-                               Description="Copy exe to pimp &amp; program files"
-                               CommandLine="copy                   release\peercast.exe                   &quot;c:\program files\peercast&quot;&#x0D;&#x0A;copy                   release\peercast.exe                   ..\pimp\&#x0D;&#x0A;"
+                               Description="Copy exe to pimp"
+                               CommandLine="copy                   release\peercast.exe                   ..\pimp\&#x0D;&#x0A;"
                        />
                </Configuration>
                <Configuration
@@ -902,5 +902,9 @@
                </Filter>
        </Files>
        <Globals>
+               <Global
+                       Name="RESOURCE_FILE"
+                       Value="Simple.rc"
+               />
        </Globals>
 </VisualStudioProject>

diff --git a/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp b/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
index 1b625a5..23eb053 100644 (file)
--- 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){
        // \8e\9f\82Ì\8aî\93_
        origin.X += r1.Width;
 
+       //// \8fã\97¬IP/\83\8a\83X\83i\81[\90\94/\83\8a\83\8c\81[\90\94\95\\8e¦
+       //// NOTE:
+       ////    \82Ò\82 \82©\82·\82Ì\93®\8dì\95×\8b­\97p\81B\83\8a\83\8a\81[\83X\83r\83\8b\83h\82Å\82Í\8c³\82Ì\83R\81[\83h\82ð\8eg\97p\82Ì\8e\96\81B
+       ////    \95¶\8e\9a\95\\8e¦\94Í\88Í\82Í\95\9d220\82®\82ç\82¢\82Å\82¨\82\8b
+       //char tmp[512]; // \95\\8e¦\97p\83o\83b\83t\83@
+       //char hostip[256]; // IP\83A\83h\83\8c\83X\83o\83b\83t\83@
+       //chDisp.uphost.toStr(hostip); // \8fã\97¬IP
+       //sprintf(tmp, "%d/%d - [%d/%d] - %s",
+       //      getTotalListeners(),
+       //      getTotalRelays(),
+       //      getLocalListeners(),
+       //      getLocalRelays(),
+       //      hostip
+       //      );
+
        // \83\8a\83X\83i\81[\90\94/\83\8a\83\8c\81[\90\94\95\\8e¦
        char tmp[256];
        sprintf(tmp, "%d/%d - [%d/%d]", getTotalListeners(), getTotalRelays(), getLocalListeners(), getLocalRelays());
@@ -1342,6 +1357,12 @@ void PopupOtherMenu(){
 }
 
 void WmCreateProc(HWND hwnd){
+       // \8e©\93®\8dÅ\91O\96Ê\8b@\94\
+       if (servMgr->topmostGui)
+       {
+               ::gbDispTop = true;
+       }
+
        if (backImage){
                ::delete backImage;
        }

diff --git a/PeerCast.root/PeerCast/ui/win32/simple/resource.h b/PeerCast.root/PeerCast/ui/win32/simple/resource.h
index a9a2b6d..0d1a433 100644 (file)
--- a/PeerCast.root/PeerCast/ui/win32/simple/resource.h
+++ b/PeerCast.root/PeerCast/ui/win32/simple/resource.h
@@ -1,5 +1,5 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
 // Used by Simple.rc
 //
 #define IDC_MYICON                      2
@@ -96,6 +96,11 @@
 #define ID_POPUP_YELLOWPAGES2           32821
 #define ID_POPUP_SAVE_GUI_POS           32823
 #define ID_POPUP_KEEP_DOWNSTREAMS       32825
+#define ID_Menu                         32826
+#define ID_Menu32827                    32827
+#define ID_POPUP_TOPMOST                32828
+#define ID_32829                        32829
+#define ID_POPUP_START_WITH_GUI         32830
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
@@ -103,7 +108,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        142
-#define _APS_NEXT_COMMAND_VALUE         32826
+#define _APS_NEXT_COMMAND_VALUE         32831
 #define _APS_NEXT_CONTROL_VALUE         1019
 #define _APS_NEXT_SYMED_VALUE           110
 #endif

diff --git a/c:/Git/PeerCast.root/PeerCast/core/common/servmgr.cpp b/c:/Git/PeerCast.root/PeerCast/core/common/servmgr.cpp
index d7bbbe7..e8d57e2 100644 (file)
--- 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()
        saveGuiPos = false;
        keepDownstreams = true;
 
+       topmostGui = false;
+       startWithGui = false;
+
        chanLog="";
 
        maxRelaysIndexTxt = 1;  // for PCRaw (relay)
@@ -1053,6 +1056,9 @@ void ServMgr::saveSettings(const char *fn)
                        iniFile.writeIntValue("guiLeft", winPlace.rcNormalPosition.left);
                        iniFile.writeIntValue("guiRight", winPlace.rcNormalPosition.right);
                }
+
+               iniFile.writeBoolValue("topmostGui", servMgr->topmostGui);
+               iniFile.writeBoolValue("startWithGui", servMgr->startWithGui);
 #endif
                int i;
 
@@ -1431,6 +1437,14 @@ void ServMgr::loadSettings(const char *fn)
                                        guiFlg = true;
                                }
                        }
+
+                       else if (iniFile.isName("topmostGui"))
+                       {
+                               servMgr->topmostGui = iniFile.getBoolValue();
+                       } else if (iniFile.isName("startWithGui"))
+                       {
+                               servMgr->startWithGui = iniFile.getBoolValue();
+                       }
 #endif
 
                        // debug

diff --git a/c:/Git/PeerCast.root/PeerCast/core/common/servmgr.h b/c:/Git/PeerCast.root/PeerCast/core/common/servmgr.h
index fa8e721..f8832fc 100644 (file)
--- 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:
        bool    saveGuiPos;
        bool    keepDownstreams;
 
+       bool topmostGui; // \8dÅ\91O\96Ê
+       bool startWithGui; // \8bN\93®\8e\9e\82ÉGUI
+
        int maxRelaysIndexTxt;  // for PCRaw (relay)
 
 private:

diff --git a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp
index 61c03f0..a71eed7 100644 (file)
--- 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;
 String exePath;
 ULONG_PTR gdiplusToken;
 
+// \83v\83\8d\83g\83^\83C\83v\90é\8c¾
+void createGUI(HWND);
+
 // ---------------------------------
 Sys * APICALL MyPeercastInst::createSys()
 {
@@ -390,6 +393,11 @@ int APIENTRY WinMain(HINSTANCE hInstance,
        if (mask & ServMgr::NT_TRACKINFO)
                CheckMenuItem(trayMenu,ID_POPUP_SHOWMESSAGES_TRACKINFO,MF_CHECKED|MF_BYCOMMAND);
 
+       if (servMgr->startWithGui)
+       {
+               createGUI((HWND)0);
+       }
+
        // Main message loop:
        while (GetMessage(&msg, NULL, 0, 0)) 
        {
@@ -823,6 +831,12 @@ void createGUI(HWND hWnd)
                        NULL);
        }
        ShowWindow(guiWnd,SW_SHOWNORMAL);
+
+       // \8e©\93®\82Å\8dÅ\91O\96Ê
+       if (servMgr->topmostGui)
+       {
+               ::SetWindowPos(guiWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
+       }
 }
 
 
@@ -1046,6 +1060,23 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                                        CheckMenuItem(trayMenu, ID_POPUP_SAVE_GUI_POS, MF_UNCHECKED|MF_BYCOMMAND);
                                }
 
+                               // \8e©\93®GUI/\8dÅ\91O\96Ê\8b@\94\
+                               if (servMgr->topmostGui)
+                               {
+                                       CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_CHECKED|MF_BYCOMMAND);
+                               } else
+                               {
+                                       CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_UNCHECKED|MF_BYCOMMAND);
+                               }
+
+                               if (servMgr->startWithGui)
+                               {
+                                       CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_CHECKED|MF_BYCOMMAND);
+                               } else
+                               {
+                                       CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_UNCHECKED|MF_BYCOMMAND);
+                               }
+
                                SetForegroundWindow(hWnd);    
                                bool skipMenu=false;
 
@@ -1256,6 +1287,34 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                                        //peercastInst->saveSettings();
                                        break;
 
+                               case ID_POPUP_TOPMOST:
+                                       // \8dÅ\91O\96Ê\95\\8e¦
+                                       if (servMgr->topmostGui)
+                                       {
+                                               servMgr->topmostGui = false;
+                                               CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_UNCHECKED|MF_BYCOMMAND);
+                                       } else
+                                       {
+                                               servMgr->topmostGui = true;
+                                               CheckMenuItem(trayMenu, ID_POPUP_TOPMOST, MF_CHECKED|MF_BYCOMMAND);
+                                       }
+                                       peercastInst->saveSettings();
+                                       break;
+
+                               case ID_POPUP_START_WITH_GUI:
+                                       // \8bN\93®\8e\9e\82ÉGUI\95\\8e¦
+                                       if (servMgr->startWithGui)
+                                       {
+                                               servMgr->startWithGui = false;
+                                               CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_UNCHECKED|MF_BYCOMMAND);
+                                       } else
+                                       {
+                                               servMgr->startWithGui = true;
+                                               CheckMenuItem(trayMenu, ID_POPUP_START_WITH_GUI, MF_CHECKED|MF_BYCOMMAND);
+                                       }
+                                       peercastInst->saveSettings();
+                                       break;
+
                                case ID_POPUP_EXIT_CONFIRM:
                                case IDM_EXIT:
                                   DestroyWindow(hWnd);

diff --git a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc
index 311c8fc..e65b7f7 100644 (file)
--- 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
 BEGIN
     POPUP "popup"
     BEGIN
-        MENUITEM "\8fî\95ñ",                        ID_POPUP_ABOUT
-        MENUITEM "\83w\83\8b\83v",                      ID_POPUP_HELP
+        MENUITEM "\8fî\95ñ",                          ID_POPUP_ABOUT
+        MENUITEM "\83w\83\8b\83v",                         ID_POPUP_HELP
         MENUITEM SEPARATOR
         POPUP "\83|\83b\83v\83A\83b\83v\83\81\83b\83Z\81[\83W"
         BEGIN
             MENUITEM "PeerCast",                    ID_POPUP_SHOWMESSAGES_PEERCAST
-
-            MENUITEM "\94z\90M\8eÒ",                      ID_POPUP_SHOWMESSAGES_BROADCASTERS
-
-            MENUITEM "\83g\83\89\83b\83N\8fî\95ñ",                ID_POPUP_SHOWMESSAGES_TRACKINFO
-
-            MENUITEM "\83A\83b\83v\83f\81[\83g\8fî\95ñ",            ID_POPUP_POPUPMESSAGES_UPGRADEALERTS
-            , CHECKED, GRAYED
+            MENUITEM "\94z\90M\8eÒ",                         ID_POPUP_SHOWMESSAGES_BROADCASTERS
+            MENUITEM "\83g\83\89\83b\83N\8fî\95ñ",                      ID_POPUP_SHOWMESSAGES_TRACKINFO
+            MENUITEM "\83A\83b\83v\83f\81[\83g\8fî\95ñ",                    ID_POPUP_POPUPMESSAGES_UPGRADEALERTS, CHECKED, GRAYED
         END
         POPUP "\8d\82\93x"
         BEGIN
-            MENUITEM "\8fî\95ñ",                        ID_POPUP_ADVANCED_INFORMATION
-
-            MENUITEM "\83\8a\83\8c\81[\83`\83\83\83\93\83l\83\8b",            ID_POPUP_ADVANCED_RELAYEDCHANNELS
-
-            MENUITEM "\94z\90M",                        ID_POPUP_ADVANCED_BROADCAST
-
-            MENUITEM "\83R\83l\83N\83V\83\87\83\93",                ID_POPUP_CONNECTIONS
-            MENUITEM "\83\8d\83O",                        ID_POPUP_ADVANCED_VIEWLOG
-
-            MENUITEM "\90Ý\92è",                        ID_POPUP_SETTINGS
-            MENUITEM "GUI\82ð\8aJ\82­",                   ID_POPUP_ADVANCED_SHOWGUI
-
+            MENUITEM "\8fî\95ñ",                          ID_POPUP_ADVANCED_INFORMATION
+            MENUITEM "\83\8a\83\8c\81[\83`\83\83\83\93\83l\83\8b",                    ID_POPUP_ADVANCED_RELAYEDCHANNELS
+            MENUITEM "\94z\90M",                          ID_POPUP_ADVANCED_BROADCAST
+            MENUITEM "\83R\83l\83N\83V\83\87\83\93",                      ID_POPUP_CONNECTIONS
+            MENUITEM "\83\8d\83O",                          ID_POPUP_ADVANCED_VIEWLOG
+            MENUITEM "\90Ý\92è",                          ID_POPUP_SETTINGS
+            MENUITEM "GUI\82ð\8aJ\82­",                      ID_POPUP_ADVANCED_SHOWGUI
         END
         POPUP "\92Ç\89Á\90Ý\92è"
         BEGIN
-            MENUITEM "\8fI\97¹\8e\9e\81A\95\\8e¦\88Ê\92u\82ð\95Û\91¶",      ID_POPUP_SAVE_GUI_POS
-            , CHECKED
-            MENUITEM "\8dÄ\90Ú\91±\8e\9e\89º\97¬\88Û\8e\9d",            ID_POPUP_KEEP_DOWNSTREAMS
-            , CHECKED
+            MENUITEM "\8fI\97¹\8e\9e\81A\95\\8e¦\88Ê\92u\82ð\95Û\91¶",                 ID_POPUP_SAVE_GUI_POS, CHECKED
+            MENUITEM "\8dÄ\90Ú\91±\8e\9e\89º\97¬\88Û\8e\9d",                    ID_POPUP_SHOWGUI, CHECKED
+            MENUITEM "\8fí\82É\8eè\91O\82É\95\\8e¦",                     ID_POPUP_TOPMOST
+            MENUITEM "\8bN\93®\8e\9e\81AGUI\82ð\95\\8e¦",                  ID_POPUP_START_WITH_GUI
         END
         MENUITEM SEPARATOR
         POPUP "\8fI\97¹"
         BEGIN
-            MENUITEM "\82Í\82¢",                        ID_POPUP_EXIT_CONFIRM
-            MENUITEM "\82¢\82¢\82¦",                      ID_POPUP_EXIT_NO
+            MENUITEM "\82Í\82¢",                          ID_POPUP_EXIT_CONFIRM
+            MENUITEM "\82¢\82¢\82¦",                         ID_POPUP_EXIT_NO
         END
     END
 END
@@ -88,7 +79,7 @@ BEGIN
     POPUP "popup"
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "\83C\83G\83\8d\81[\83y\81[\83W",              ID_POPUP_YELLOWPAGES
+        MENUITEM "\83C\83G\83\8d\81[\83y\81[\83W",                     ID_POPUP_YELLOWPAGES
         POPUP "\83C\83G\83\8d\81[\83y\81[\83W"
         BEGIN
             MENUITEM "AAA",                         ID_POPUP_YELLOWPAGES1
@@ -97,7 +88,7 @@ BEGIN
     END
 END
 
-IDR_GUIMENU MENU
+IDR_GUIMENU MENU 
 BEGIN
     POPUP "popup"
     BEGIN
@@ -111,51 +102,41 @@ BEGIN
     END
 END
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 
 IDD_MAINWINDOW DIALOGEX 0, 0, 298, 341
-STYLE DS_SETFONT | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU | 
-    WS_THICKFRAME
+STYLE DS_SETFONT | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "PeerCast"
 FONT 9, "MS UI Gothic", 0, 0, 0x1
 BEGIN
-    LISTBOX         IDC_LIST1,3,291,291,43,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "\97L\8cø",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | 
-                    WS_TABSTOP,9,29,60,20,WS_EX_TRANSPARENT
+    LISTBOX         IDC_LIST1,3,291,291,43,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "\97L\8cø",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,9,29,60,20,WS_EX_TRANSPARENT
     EDITTEXT        IDC_EDIT1,127,18,47,12,ES_AUTOHSCROLL
     RTEXT           "\83|\81[\83g :",IDC_STATIC,107,20,18,8
-    LISTBOX         IDC_LIST2,3,206,291,71,LBS_OWNERDRAWFIXED | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    LISTBOX         IDC_LIST2,3,206,291,71,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "\83\8d\83O",IDC_STATIC_LOG,3,282,13,8
     LTEXT           "\83R\83l\83N\83V\83\87\83\93",IDC_STATIC_CONNECTION,3,184,40,8
     GROUPBOX        "",IDC_STATIC,3,4,291,49
     PUSHBUTTON      "\83N\83\8a\83A",IDC_BUTTON1,35,279,25,11
-    LISTBOX         IDC_LIST3,3,81,291,67,LBS_OWNERDRAWFIXED | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    LISTBOX         IDC_LIST3,3,81,291,67,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "\90Ø\92f",IDC_BUTTON5,67,65,43,13
     GROUPBOX        "\83\8a\83\8c\81[",IDC_GROUPBOX_RELAY,3,54,291,96
     EDITTEXT        IDC_EDIT3,127,34,47,12,ES_PASSWORD | ES_AUTOHSCROLL
     RTEXT           "\83p\83X\83\8f\81[\83h :",IDC_STATIC,89,36,36,8
-    CONTROL         "\83f\83o\83b\83O",IDC_LOGDEBUG,"Button",BS_AUTOCHECKBOX | 
-                    BS_PUSHLIKE | WS_TABSTOP,127,279,32,11
-    CONTROL         "\83l\83b\83g\83\8f\81[\83N",IDC_LOGNETWORK,"Button",BS_AUTOCHECKBOX | 
-                    BS_PUSHLIKE | WS_TABSTOP,185,279,35,11
-    CONTROL         "\83G\83\89\81[",IDC_LOGERRORS,"Button",BS_AUTOCHECKBOX | 
-                    BS_PUSHLIKE | WS_TABSTOP,159,279,25,11
-    CONTROL         "\92â\8e~",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | 
-                    WS_TABSTOP,60,279,30,11
+    CONTROL         "\83f\83o\83b\83O",IDC_LOGDEBUG,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,127,279,32,11
+    CONTROL         "\83l\83b\83g\83\8f\81[\83N",IDC_LOGNETWORK,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,185,279,35,11
+    CONTROL         "\83G\83\89\81[",IDC_LOGERRORS,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,159,279,25,11
+    CONTROL         "\92â\8e~",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,60,279,30,11
     PUSHBUTTON      "\8dÄ\90¶",IDC_BUTTON8,10,65,22,13
-    CONTROL         "\83`\83\83\83\93\83l\83\8b",IDC_LOGCHANNELS,"Button",BS_AUTOCHECKBOX | 
-                    BS_PUSHLIKE | WS_TABSTOP,221,279,35,11
+    CONTROL         "\83`\83\83\83\93\83l\83\8b",IDC_LOGCHANNELS,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,221,279,35,11
     PUSHBUTTON      "\8dÄ\90Ú\91±",IDC_BUTTON3,41,65,24,13
     EDITTEXT        IDC_EDIT9,33,159,261,14,ES_AUTOHSCROLL
-    CONTROL         "DJ",IDC_CHECK11,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | 
-                    WS_TABSTOP,5,160,23,12
+    CONTROL         "DJ",IDC_CHECK11,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,5,160,23,12
     RTEXT           "\8dÅ\91å\83\8a\83\8c\81[\90\94 :",IDC_STATIC,203,20,40,8
     EDITTEXT        IDC_MAXRELAYS,248,18,40,14,ES_AUTOHSCROLL | ES_NUMBER
     PUSHBUTTON      "\83L\81[\83v",IDC_BUTTON9,112,65,24,13
@@ -170,27 +151,20 @@ CAPTION "Channel Information"
 FONT 9, "MS UI Gothic", 400, 0, 0x80
 BEGIN
     LTEXT           "\96¼\91O:",IDC_STATIC,7,8,24,9
-    EDITTEXT        IDC_EDIT_NAME,7,18,170,21,ES_MULTILINE | ES_READONLY | 
-                    NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
+    EDITTEXT        IDC_EDIT_NAME,7,18,170,21,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
     LTEXT           "\93à\97e:",IDC_STATIC,7,79,93,9
-    EDITTEXT        IDC_EDIT_PLAYING,8,90,170,21,ES_MULTILINE | ES_READONLY | 
-                    NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
+    EDITTEXT        IDC_EDIT_PLAYING,8,90,170,21,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
     LTEXT           "DJ \83\81\83b\83Z\81[\83W:",IDC_STATIC,7,117,41,9
-    EDITTEXT        IDC_EDIT_MESSAGE,8,128,170,21,ES_MULTILINE | ES_READONLY | 
-                    NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
+    EDITTEXT        IDC_EDIT_MESSAGE,8,128,170,21,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
     PUSHBUTTON      "URL",IDC_CONTACT,7,185,34,15,0,0,HIDC_CONTACT
     LTEXT           "\8fÚ\8d×:",IDC_STATIC,7,43,67,8
-    EDITTEXT        IDC_EDIT_DESC,8,53,170,21,ES_MULTILINE | ES_READONLY | 
-                    NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
+    EDITTEXT        IDC_EDIT_DESC,8,53,170,21,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
     RTEXT           "\8c`\8e®",IDC_FORMAT,69,80,107,8
     LTEXT           "\83W\83\83\83\93\83\8b:",IDC_STATIC,63,5,22,8
-    EDITTEXT        IDC_EDIT_GENRE,87,3,90,12,ES_AUTOHSCROLL | ES_READONLY | 
-                    NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
-    CONTROL         "\83L\81[\83v",IDC_KEEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    144,188,33,10
+    EDITTEXT        IDC_EDIT_GENRE,87,3,90,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
+    CONTROL         "\83L\81[\83v",IDC_KEEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,144,188,33,10
     LTEXT           "\83X\83e\81[\83^\83X:",IDC_STATIC,7,153,41,9
-    EDITTEXT        IDC_EDIT_STATUS,8,163,82,12,ES_READONLY | NOT WS_BORDER | 
-                    NOT WS_TABSTOP,WS_EX_STATICEDGE
+    EDITTEXT        IDC_EDIT_STATUS,8,163,82,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
     PUSHBUTTON      "\8dÄ\90¶",IDC_PLAY,56,185,34,15
 END
 
@@ -259,8 +233,7 @@ IDR_VERMENU MENU
 BEGIN
     POPUP "popup"
     BEGIN
-        MENUITEM "Please upgrade PeerCast. Click here to download.", 
-                                                ID_POPUP_UPGRADE
+        MENUITEM "Please upgrade PeerCast. Click here to download.", ID_POPUP_UPGRADE
     END
 END
 
@@ -271,8 +244,7 @@ END
 //
 
 IDD_ABOUTBOX DIALOG  22, 17, 163, 59
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
 FONT 8, "System"
 BEGIN

diff --git a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
index f161204..4102c17 100644 (file)
--- 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 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
-                               Description="Copy exe to pimp &amp; program files"
-                               CommandLine="copy                   release\peercast.exe                   &quot;c:\program files\peercast&quot;&#x0D;&#x0A;copy                   release\peercast.exe                   ..\pimp\&#x0D;&#x0A;"
+                               Description="Copy exe to pimp"
+                               CommandLine="copy                   release\peercast.exe                   ..\pimp\&#x0D;&#x0A;"
                        />
                </Configuration>
                <Configuration
@@ -902,5 +902,9 @@
                </Filter>
        </Files>
        <Globals>
+               <Global
+                       Name="RESOURCE_FILE"
+                       Value="Simple.rc"
+               />
        </Globals>
 </VisualStudioProject>

diff --git a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
index 1b625a5..23eb053 100644 (file)
--- 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){
        // \8e\9f\82Ì\8aî\93_
        origin.X += r1.Width;
 
+       //// \8fã\97¬IP/\83\8a\83X\83i\81[\90\94/\83\8a\83\8c\81[\90\94\95\\8e¦
+       //// NOTE:
+       ////    \82Ò\82 \82©\82·\82Ì\93®\8dì\95×\8b­\97p\81B\83\8a\83\8a\81[\83X\83r\83\8b\83h\82Å\82Í\8c³\82Ì\83R\81[\83h\82ð\8eg\97p\82Ì\8e\96\81B
+       ////    \95¶\8e\9a\95\\8e¦\94Í\88Í\82Í\95\9d220\82®\82ç\82¢\82Å\82¨\82\8b
+       //char tmp[512]; // \95\\8e¦\97p\83o\83b\83t\83@
+       //char hostip[256]; // IP\83A\83h\83\8c\83X\83o\83b\83t\83@
+       //chDisp.uphost.toStr(hostip); // \8fã\97¬IP
+       //sprintf(tmp, "%d/%d - [%d/%d] - %s",
+       //      getTotalListeners(),
+       //      getTotalRelays(),
+       //      getLocalListeners(),
+       //      getLocalRelays(),
+       //      hostip
+       //      );
+
        // \83\8a\83X\83i\81[\90\94/\83\8a\83\8c\81[\90\94\95\\8e¦
        char tmp[256];
        sprintf(tmp, "%d/%d - [%d/%d]", getTotalListeners(), getTotalRelays(), getLocalListeners(), getLocalRelays());
@@ -1342,6 +1357,12 @@ void PopupOtherMenu(){
 }
 
 void WmCreateProc(HWND hwnd){
+       // \8e©\93®\8dÅ\91O\96Ê\8b@\94\
+       if (servMgr->topmostGui)
+       {
+               ::gbDispTop = true;
+       }
+
        if (backImage){
                ::delete backImage;
        }

diff --git a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/resource.h b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/resource.h
index a9a2b6d..0d1a433 100644 (file)
--- 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 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
 // Used by Simple.rc
 //
 #define IDC_MYICON                      2
@@ -96,6 +96,11 @@
 #define ID_POPUP_YELLOWPAGES2           32821
 #define ID_POPUP_SAVE_GUI_POS           32823
 #define ID_POPUP_KEEP_DOWNSTREAMS       32825
+#define ID_Menu                         32826
+#define ID_Menu32827                    32827
+#define ID_POPUP_TOPMOST                32828
+#define ID_32829                        32829
+#define ID_POPUP_START_WITH_GUI         32830
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
@@ -103,7 +108,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        142
-#define _APS_NEXT_COMMAND_VALUE         32826
+#define _APS_NEXT_COMMAND_VALUE         32831
 #define _APS_NEXT_CONTROL_VALUE         1019
 #define _APS_NEXT_SYMED_VALUE           110
 #endif