Changeset 757


Ignore:
Timestamp:
05/15/09 09:39:18 (10 years ago)
Author:
Eoin
Message:

Midway not compiling code because incomplete for datetime picker dialog.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/lang/Build.bat

    r751 r757  
    1 call ruby tools\res_translator.rb ../res/ Halite Dutch French German Hungarian Italian Japanese Norwegian Template Polish Portuguese Russian Serbian "Serbian (Cyrillic)" Spanish Slovenian Swedish Turkish Greek 
     1call ruby tools\res_translator.rb ../res/ Halite Dutch French German Hungarian Italian Flipped Japanese Norwegian Template Polish Portuguese Russian Serbian "Serbian (Cyrillic)" Spanish Slovenian Swedish Turkish Greek 
    22 
    33pause 
  • trunk/res/Halite.rc

    r730 r757  
    182182FONT 8, "MS Shell Dlg", 400, 0, 0x1 
    183183BEGIN 
    184     RTEXT           "Open a (single) port between : ",HAL_BITT_OPENPORT,12,31,120,12,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    185     EDITTEXT        HAL_BC_PORTFROM,135,29,65,12,ES_AUTOHSCROLL 
    186     EDITTEXT        HAL_BC_PORTTO,250,29,65,12,ES_AUTOHSCROLL 
    187     CONTROL         "Enable DHT (will not apply to private torrents)",HAL_BC_DHT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,120,90,10 
    188          
    189     EDITTEXT        HAL_BC_DHT_MAXREPLIES_T,180,119,80,12,ES_AUTOHSCROLL 
     184        RTEXT           "Open a (single) port between : ",HAL_BITT_OPENPORT,12,31,120,12,SS_WORDELLIPSIS|SS_CENTERIMAGE 
     185        EDITTEXT        HAL_BC_PORTFROM,135,29,65,12,ES_AUTOHSCROLL 
     186        EDITTEXT        HAL_BC_PORTTO,250,29,65,12,ES_AUTOHSCROLL 
     187        CONTROL         "Enable DHT (will not apply to private torrents)",HAL_BC_DHT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,120,90,10 
     188 
     189        EDITTEXT        HAL_BC_DHT_MAXREPLIES_T,180,119,80,12,ES_AUTOHSCROLL 
    190190        RTEXT           "Max replies : ",HAL_BC_DHT_MAXREPLIES_S,110,121,70,8,SS_WORDELLIPSIS|SS_CENTERIMAGE     
    191     EDITTEXT        HAL_BC_DHT_BRANCHING_T,180,119,80,12,ES_AUTOHSCROLL 
     191        EDITTEXT        HAL_BC_DHT_BRANCHING_T,180,119,80,12,ES_AUTOHSCROLL 
    192192        RTEXT           "Search banching : ",HAL_BC_DHT_BRANCHING_S,110,121,70,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    193     EDITTEXT        HAL_BC_DHT_MAXFAILS_T,180,119,80,12,ES_AUTOHSCROLL 
     193        EDITTEXT        HAL_BC_DHT_MAXFAILS_T,180,119,80,12,ES_AUTOHSCROLL 
    194194        RTEXT           "Max failures : ",HAL_BC_DHT_MAXFAILS_S,110,121,70,8,SS_WORDELLIPSIS|SS_CENTERIMAGE      
    195          
    196     CONTROL         "Port (UDP)",HAL_BC_DHT_PORT_R,"Button",BS_AUTORADIOBUTTON|WS_GROUP,211,19,57,10 
    197     EDITTEXT        HAL_BC_DHT_PORT_E,180,119,80,12,ES_AUTOHSCROLL 
     195 
     196        CONTROL         "Port (UDP)",HAL_BC_DHT_PORT_R,"Button",BS_AUTORADIOBUTTON|WS_GROUP,211,19,57,10 
     197        EDITTEXT        HAL_BC_DHT_PORT_E,180,119,80,12,ES_AUTOHSCROLL 
    198198        CONTROL         "random up to",HAL_BC_DHT_RAND_PORT_R,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,29,40,12 
    199     EDITTEXT        HAL_BC_DHT_PORT_UPPER_E,180,119,80,12,ES_AUTOHSCROLL 
    200     CONTROL         "Match the listen port number (recommended).",HAL_BC_DHT_PORT_LISTEN_R,"Button",BS_AUTORADIOBUTTON,211,19,57,10 
    201  
    202 //    CONTROL         "Enable DHT Extentions",HAL_BC_DHT_EXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,120,90,10 
    203     CONTROL         "to",HAL_BC_PORTCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,29,40,12 
    204     CONTROL         "Select a random port within this range.",HAL_BITT_RANDOMIZE_PORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,29,40,12 
    205     LTEXT           "Select the (TCP) port (or range) on which to listen for incoming connections.",HAL_BITT_SELECT_TEXT,12,17,300,11,SS_WORDELLIPSIS | SS_CENTERIMAGE 
    206     GROUPBOX        "Distributed Hash Tables",HAL_BITT_GDHT,5,108,260,39 
    207  //   RTEXT           "(DHT will not apply to private torrents)",HAL_BITT_DHT_NOTE,11,134,250,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 
    208     GROUPBOX        "General Settings",HAL_BITT_GSETTINGS,5,6,315,54 
    209     EDITTEXT        HAL_BC_HALFCONN_NUM,205,44,65,12,ES_AUTOHSCROLL 
    210     CONTROL         "Limit the no. of half-open connections",HAL_BC_HALFCONN_CHECK, 
    211                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,45,190,12 
    212     GROUPBOX        "Port Forwarding",HAL_BITT_GPORTFORWARDING,5,6,315,54 
    213 //    CONTROL         "None (Managed Externally)",HAL_BITT_GPORTFORWARD_NONE,"Button",BS_AUTORADIOBUTTON|WS_GROUP,284,73,16,11 
    214     CONTROL         "UnPlug and Play",HAL_BITT_GPORTFORWARD_UPNG,"Button",BS_AUTOCHECKBOX,284,83,16,11 
    215     CONTROL         "NAT-PMP",HAL_BIT_GPORTFORWARD_NATPMP,"Button",BS_AUTOCHECKBOX,284,93,16,11 
    216     LTEXT           "UPnP router model (if recognised).",HAL_BIT_GPORTFORWARD_MODEL,12,17,300,11,SS_WORDELLIPSIS | SS_CENTERIMAGE        
    217     EDITTEXT        HAL_BIT_GPORTFORWARD_MODELTEXT,135,29,65,12,ES_AUTOHSCROLL 
    218     PUSHBUTTON      "Test",HAL_BITT_GPORTFORWARD_TEST,207,46,51,11,NOT WS_VISIBLE 
    219  
    220     LISTBOX         HAL_BITT_GPORTFORWARD_LIST,165,24,149,7,LBS_SORT|LBS_NOINTEGRALHEIGHT|WS_VSCROLL|WS_TABSTOP|NOT WS_VISIBLE 
    221 //    RTEXT           "Need Help?",HAL_BC_HELP_LINK,229,139,51,8 
    222 //    RTEXT           "Why?",HAL_BC_CON_WHY,239,47,31,8 
     199        EDITTEXT        HAL_BC_DHT_PORT_UPPER_E,180,119,80,12,ES_AUTOHSCROLL 
     200        CONTROL         "Match the listen port number (recommended).",HAL_BC_DHT_PORT_LISTEN_R,"Button",BS_AUTORADIOBUTTON,211,19,57,10 
     201 
     202        //    CONTROL         "Enable DHT Extentions",HAL_BC_DHT_EXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,120,90,10 
     203        CONTROL         "to",HAL_BC_PORTCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,29,40,12 
     204        CONTROL         "Select a random port within this range.",HAL_BITT_RANDOMIZE_PORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,29,40,12 
     205        LTEXT           "Select the (TCP) port (or range) on which to listen for incoming connections.",HAL_BITT_SELECT_TEXT,12,17,300,11,SS_WORDELLIPSIS | SS_CENTERIMAGE 
     206        GROUPBOX        "Distributed Hash Tables",HAL_BITT_GDHT,5,108,260,39 
     207        //   RTEXT           "(DHT will not apply to private torrents)",HAL_BITT_DHT_NOTE,11,134,250,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 
     208        GROUPBOX        "General Settings",HAL_BITT_GSETTINGS,5,6,315,54 
     209        EDITTEXT        HAL_BC_HALFCONN_NUM,205,44,65,12,ES_AUTOHSCROLL 
     210        CONTROL         "Limit the no. of half-open connections",HAL_BC_HALFCONN_CHECK, 
     211        "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,45,190,12 
     212        GROUPBOX        "Port Forwarding",HAL_BITT_GPORTFORWARDING,5,6,315,54 
     213        //    CONTROL         "None (Managed Externally)",HAL_BITT_GPORTFORWARD_NONE,"Button",BS_AUTORADIOBUTTON|WS_GROUP,284,73,16,11 
     214        CONTROL         "UnPlug and Play",HAL_BITT_GPORTFORWARD_UPNG,"Button",BS_AUTOCHECKBOX,284,83,16,11 
     215        CONTROL         "NAT-PMP",HAL_BIT_GPORTFORWARD_NATPMP,"Button",BS_AUTOCHECKBOX,284,93,16,11 
     216        LTEXT           "UPnP router model (if recognised).",HAL_BIT_GPORTFORWARD_MODEL,12,17,300,11,SS_WORDELLIPSIS | SS_CENTERIMAGE    
     217        EDITTEXT        HAL_BIT_GPORTFORWARD_MODELTEXT,135,29,65,12,ES_AUTOHSCROLL 
     218        PUSHBUTTON      "Test",HAL_BITT_GPORTFORWARD_TEST,207,46,51,11,NOT WS_VISIBLE 
     219 
     220        LISTBOX         HAL_BITT_GPORTFORWARD_LIST,165,24,149,7,LBS_SORT|LBS_NOINTEGRALHEIGHT|WS_VSCROLL|WS_TABSTOP|NOT WS_VISIBLE 
     221        //    RTEXT           "Need Help?",HAL_BC_HELP_LINK,229,139,51,8 
     222        //    RTEXT           "Why?",HAL_BC_CON_WHY,239,47,31,8 
    223223END 
    224224 
     
    454454BEGIN 
    455455        LTEXT           "Torrent save folder:",HAL_ADDT_DEFFLD_TEXT,0,0,215,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    456     EDITTEXT        HAL_BC_SAVEFOLDER,5,5,195,13,ES_AUTOHSCROLL 
    457     PUSHBUTTON      "...",HAL_BC_SAVEBROWSE,205,5,18,13 
     456        EDITTEXT        HAL_BC_SAVEFOLDER,5,5,195,13,ES_AUTOHSCROLL 
     457        PUSHBUTTON      "...",HAL_BC_SAVEBROWSE,205,5,18,13 
    458458        CONTROL         "Move the completed torrent to:",HAL_ADDT_MOVETO_CHECK,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,38,220,8 
    459459        EDITTEXT        HAL_ADDT_MOVETO_FOLDER,5,5,195,13,ES_AUTOHSCROLL 
    460     PUSHBUTTON      "...",HAL_ADDT_MOVETO_BROWSE,205,5,18,13 
     460        PUSHBUTTON      "...",HAL_ADDT_MOVETO_BROWSE,205,5,18,13 
     461END 
     462 
     463HAL_DATETIME_DLG DIALOGEX 4, 4, 198, 42 
     464STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD  
     465FONT 8, "MS Shell Dlg", 400, 0, 0x1 
     466BEGIN 
     467        LTEXT           "Torrent save folder:",HAL_DATETIME_DEFFLD_TEXT,0,0,215,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    461468END 
    462469 
     
    656663        MENUITEM SEPARATOR 
    657664        MENUITEM "E&xit",ID_TRAY_EXIT 
     665    END 
     666END 
     667 
     668HAL_SHUTDOWN_MENU MENU 
     669BEGIN 
     670    POPUP "_POPUP_" 
     671    BEGIN 
     672        MENUITEM "Open &Halite",HAL_SHUTDOWN_OPENHALITE 
     673        MENUITEM SEPARATOR 
     674        MENUITEM "&Pause All",HAL_SHUTDOWN_PAUSEALL 
     675        MENUITEM "&Resume All",HAL_SHUTDOWN_RESUMEALL 
     676        MENUITEM SEPARATOR 
     677        MENUITEM "E&xit",HAL_SHUTDOWN_EXIT 
    658678    END 
    659679END 
     
    862882END 
    863883 
    864 HAL_FILESLISTVIEW_MENU MENU 
    865 BEGIN 
    866     POPUP "_POPUP_" 
    867     BEGIN 
    868         POPUP "Set Priority" 
    869         BEGIN 
    870             MENUITEM "Don't download",ID_HAL_FILE_PRIORITY_0 
    871             MENUITEM "Normal",ID_HAL_FILE_PRIORITY_1 
    872 //            MENUITEM "2",ID_HAL_FILE_PRIORITY_2 
    873 //            MENUITEM "3",ID_HAL_FILE_PRIORITY_3 
    874 //            MENUITEM "4",ID_HAL_FILE_PRIORITY_4 
    875             MENUITEM "Above Normal",ID_HAL_FILE_PRIORITY_5 
    876 //            MENUITEM "6",ID_HAL_FILE_PRIORITY_6 
    877             MENUITEM "Maximum",ID_HAL_FILE_PRIORITY_7 
    878         END 
    879     END 
    880 END 
     884        HAL_FILESLISTVIEW_MENU MENU 
     885        BEGIN 
     886                POPUP "_POPUP_" 
     887                BEGIN 
     888                        POPUP "Set Priority" 
     889                        BEGIN 
     890                                MENUITEM "Don't download",ID_HAL_FILE_PRIORITY_0 
     891                                MENUITEM "Normal",ID_HAL_FILE_PRIORITY_1 
     892                        //      MENUITEM "2",ID_HAL_FILE_PRIORITY_2 
     893                        //      MENUITEM "3",ID_HAL_FILE_PRIORITY_3 
     894                        //      MENUITEM "4",ID_HAL_FILE_PRIORITY_4 
     895                                MENUITEM "Above Normal",ID_HAL_FILE_PRIORITY_5 
     896                        //      MENUITEM "6",ID_HAL_FILE_PRIORITY_6 
     897                                MENUITEM "Maximum",ID_HAL_FILE_PRIORITY_7 
     898                        END 
     899                END 
     900        END 
    881901 
    882902HAL_MAINFRAME TOOLBAR 22,22 
  • trunk/src/HaliteWindow.cpp

    r749 r757  
    593593LRESULT HaliteWindow::OnAutoShutdown(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) 
    594594{        
     595        WTL::CMenuHandle m; 
     596        WTL::CMenu menu; 
     597         
     598 
     599        m.LoadMenu(HAL_SHUTDOWN_MENU); 
     600        menu.Attach(m.GetSubMenu(0)); 
     601 
     602                        POINT ptPoint; 
     603                        GetCursorPos(&ptPoint); 
     604                        menu.TrackPopupMenu(0, ptPoint.x, ptPoint.y, m_hWnd); 
     605 
    595606        return 0; 
    596607} 
  • trunk/src/HaliteWindow.hpp

    r716 r757  
    88 
    99#define ID_WINDOW_BEGIN                                 13000 
    10 #define HAL_WINDOW_CLOSECONFRIM         ID_WINDOW_BEGIN + 1 
     10#define HAL_SHUTDOWN_MENU                                       13001 
     11#define HAL_WINDOW_CLOSECONFRIM         ID_WINDOW_BEGIN + 10 
    1112#define HAL_WINDOW_SOCKETS_FAILED       ID_WINDOW_BEGIN + 2 
    1213#define HAL_WINDOW_AUTOSHUTDOWN         ID_WINDOW_BEGIN + 3 
    13 #define HAL_WINDOW_EXIT                                 ID_WINDOW_BEGIN + 4 
     14#define HAL_WINDOW_EXIT                 ID_WINDOW_BEGIN + 4 
     15#define HAL_SHUTDOWN_OPENHALITE ID_WINDOW_BEGIN + 6 
     16#define HAL_SHUTDOWN_PAUSEALL           ID_WINDOW_BEGIN + 7 
     17#define HAL_SHUTDOWN_RESUMEALL                  ID_WINDOW_BEGIN + 8 
     18#define HAL_SHUTDOWN_EXIT                       ID_WINDOW_BEGIN + 9 
    1419 
    1520#ifndef RC_INVOKED 
Note: See TracChangeset for help on using the changeset viewer.