Changeset 364 for trunk


Ignore:
Timestamp:
12/27/07 12:43:50 (12 years ago)
Author:
Eoin
Message:

Added 'Close to tray' and 'Confirm on close'.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/res/Halite.rc

    r356 r364  
    55#include "../src/advtabs/Tracker.hpp" 
    66#include "../src/advtabs/TrackerListView.hpp" 
     7#include "../src/HaliteWindow.hpp" 
    78#include "../src/HaliteDialog.hpp" 
    89#include "../src/ConfigOptions.hpp" 
     
    1415STRINGTABLE  
    1516BEGIN 
    16     HALITE_LANGUAGE    "English" 
     17    HALITE_LANGUAGE "English" 
    1718END 
    1819 
     
    323324FONT 8, "MS Shell Dlg", 400, 0, 0x1 
    324325BEGIN 
    325     CONTROL         "Allow only one instance to run.",IDC_GENERAL_ONEINST, 
     326    CONTROL         "Allow only one instance to run",IDC_GENERAL_ONEINST, 
    326327                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,16,150,11 
    327328    GROUPBOX        "General Settings",IDC_GENERAL_GROUP,5,6,315,77 
    328329    CONTROL         "Advanced GUI",IDC_GENERAL_ADVGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,42,150,11 
    329330    CONTROL         "Minimize to tray.",IDC_GENERAL_TRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,29,150,11 
     331    CONTROL         "Close to tray",IDC_GENERAL_CLOSETRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,42,150,11 
     332    CONTROL         "Confirm on close",IDC_GENERAL_CONFIRMCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,29,150,11 
    330333    LISTBOX         IDC_LANGLIST,165,24,149,70,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP 
    331334    CTEXT           "Language (requires restart)",IDC_GENERAL_LANG,165,13,150,8 
     
    492495        HAL_AUTOSORT                              "Auto Sort" 
    493496        HAL_TORRENT_ROOT                          "Torrent Root" 
     497        HAL_WINDOW_CLOSECONFRIM           "Are you sure you wish to close Halite? Doing so will stop any active torrents" 
    494498END 
    495499 
  • trunk/src/ConfigOptions.hpp

    r348 r364  
    3838#define IDC_GENERAL_GROUP                       ID_CONFIG_BEGIN + 29 
    3939#define IDC_GENERAL_LANG                        ID_CONFIG_BEGIN + 30 
     40#define IDC_GENERAL_CLOSETRAY           ID_CONFIG_BEGIN + 31 
     41#define IDC_GENERAL_CONFIRMCLOSE        ID_CONFIG_BEGIN + 32 
    4042 
    4143#ifndef RC_INVOKED 
     
    7779        DDX_CHECK(IDC_GENERAL_TRAY, haliteWindow_->use_tray) 
    7880        DDX_CHECK(IDC_GENERAL_ADVGUI, haliteWindow_->advancedUI) 
     81        DDX_CHECK(IDC_GENERAL_CLOSETRAY, haliteWindow_->closeToTray) 
     82        DDX_CHECK(IDC_GENERAL_CONFIRMCLOSE, haliteWindow_->confirmClose) 
    7983    END_DDX_MAP() 
    8084         
     
    8589                WMB_ROW(_auto,  IDC_GENERAL_ADVGUI), \ 
    8690                WMB_ROW(_auto,  IDC_GENERAL_TRAY), \ 
     91                WMB_ROW(_auto,  IDC_GENERAL_CLOSETRAY), \ 
     92                WMB_ROW(_auto,  IDC_GENERAL_CONFIRMCLOSE), \ 
    8793        WMB_END() 
    8894 
  • trunk/src/HaliteWindow.hpp

    r347 r364  
    66 
    77#pragma once 
     8 
     9#define ID_WINDOW_BEGIN                         13000 
     10#define HAL_WINDOW_CLOSECONFRIM         ID_WINDOW_BEGIN + 1 
     11 
     12#ifndef RC_INVOKED 
    813 
    914#include "stdAfx.hpp" 
     
    183188                ar & BOOST_SERIALIZATION_NVP(advancedUI); 
    184189                ar & BOOST_SERIALIZATION_NVP(activeTab); 
     190                if (version > 0) { 
     191                        ar & BOOST_SERIALIZATION_NVP(closeToTray); 
     192                        ar & BOOST_SERIALIZATION_NVP(confirmClose); 
     193                } 
    185194        } 
    186195         
     
    195204        CHorSplitterWindow m_Split; 
    196205    CMultiPaneStatusBarCtrl m_StatusBar; 
    197         CTrayNotifyIcon m_trayIcon; 
     206        CTrayNotifyIcon trayIcon_; 
    198207 
    199208        HaliteListViewCtrl haliteList; 
     
    212221        bool use_tray; 
    213222        bool advancedUI; 
     223        bool closeToTray; 
     224        bool confirmClose; 
    214225        int activeTab; 
    215226}; 
    216227 
    217 BOOST_CLASS_VERSION(HaliteWindow, 0) 
     228BOOST_CLASS_VERSION(HaliteWindow, 1) 
     229 
     230#endif // RC_INVOKED 
Note: See TracChangeset for help on using the changeset viewer.