* ALL: replaced TUpDown components by TCSpinEdit ones, which allow

   values greater than 32767. It fixes the audio bug ocurring when a
   configuration file is saved under the win32 interface

 * ./plugins/win32/mainframe.cpp: Added some extra space between
   statusbar and toolbar when nothing is displayed. I find it nicer :)

diff --git a/plugins/win32/disc.cpp b/plugins/win32/disc.cpp
index 7ea4ceb36c0111c7f2efa2656ae79b04eefdacfb..9a6cd9e9b796a2de010c3d6034ed370a597ea25b 100644 (file)
--- a/plugins/win32/disc.cpp
+++ b/plugins/win32/disc.cpp
@@ -36,6 +36,7 @@
 \r
 //---------------------------------------------------------------------------\r
 //#pragma package(smart_init)\r
+#pragma link "CSPIN"\r
 #pragma resource "*.dfm"\r
 \r
 extern  struct intf_thread_s *p_intfGlobal;\r
@@ -84,8 +85,8 @@ void __fastcall TDiscDlg::BitBtnOkClick( TObject *Sender )
     }\r
 \r
     /* Select title and chapter */\r
-    Title.sprintf( "%d", UpDownTitle->Position );\r
-    Chapter.sprintf( "%d", UpDownChapter->Position );\r
+    Title.sprintf( "%d", SpinEditTitle->Value );\r
+    Chapter.sprintf( "%d", SpinEditChapter->Value );\r
 \r
     /* Build source name and add it to playlist */\r
     Source = Method + ":" + Device + "@" + Title + "," + Chapter;\r

diff --git a/plugins/win32/disc.dfm b/plugins/win32/disc.dfm
index 788bb2b5b41c5dedd150d11ba8f364bba5eb32c8..a86d5303ed8d024fbb4b5d877486c65cf3db609d 100644 (file)
--- a/plugins/win32/disc.dfm
+++ b/plugins/win32/disc.dfm
@@ -275,47 +275,29 @@ object DiscDlg: TDiscDlg
       Height = 13\r
       Caption = 'Chapter'\r
     end\r
-    object EditTitle: TEdit\r
+    object SpinEditTitle: TCSpinEdit\r
       Left = 64\r
-      Top = 20\r
-      Width = 57\r
-      Height = 21\r
+      Top = 19\r
+      Width = 73\r
+      Height = 22\r
+      TabStop = True\r
+      MaxValue = 65535\r
+      MinValue = 1\r
+      ParentColor = False\r
       TabOrder = 0\r
-      Text = '1'\r
+      Value = 1\r
     end\r
-    object EditChapter: TEdit\r
+    object SpinEditChapter: TCSpinEdit\r
       Left = 64\r
-      Top = 48\r
-      Width = 57\r
-      Height = 21\r
+      Top = 47\r
+      Width = 73\r
+      Height = 22\r
+      TabStop = True\r
+      MaxValue = 65535\r
+      MinValue = 1\r
+      ParentColor = False\r
       TabOrder = 1\r
-      Text = '1'\r
-    end\r
-    object UpDownTitle: TUpDown\r
-      Left = 121\r
-      Top = 20\r
-      Width = 15\r
-      Height = 21\r
-      Associate = EditTitle\r
-      Min = 1\r
-      Max = 32767\r
-      Position = 1\r
-      TabOrder = 2\r
-      Thousands = False\r
-      Wrap = False\r
-    end\r
-    object UpDownChapter: TUpDown\r
-      Left = 121\r
-      Top = 48\r
-      Width = 15\r
-      Height = 21\r
-      Associate = EditChapter\r
-      Min = 1\r
-      Max = 32767\r
-      Position = 1\r
-      TabOrder = 3\r
-      Thousands = False\r
-      Wrap = False\r
+      Value = 1\r
     end\r
   end\r
   object RadioGroupType: TRadioGroup\r

diff --git a/plugins/win32/disc.h b/plugins/win32/disc.h
index 646955c73e2002ca34d94f1f125d0bb2a0bc1361..1e2646d6066828581679e05dd95f592e3aa02e00 100644 (file)
--- a/plugins/win32/disc.h
+++ b/plugins/win32/disc.h
@@ -30,6 +30,7 @@
 #include <Buttons.hpp>\r
 #include <ComCtrls.hpp>\r
 #include <ExtCtrls.hpp>\r
+#include "CSPIN.h"\r
 //---------------------------------------------------------------------------\r
 class TDiscDlg : public TForm\r
 {\r
@@ -38,14 +39,12 @@ __published:        // IDE-managed Components
     TGroupBox *GroupBoxPosition;\r
     TLabel *LabelTitle;\r
     TLabel *LabelChapter;\r
-    TEdit *EditTitle;\r
-    TEdit *EditChapter;\r
-    TUpDown *UpDownTitle;\r
-    TUpDown *UpDownChapter;\r
     TRadioGroup *RadioGroupType;\r
     TBitBtn *BitBtnOk;\r
     TBitBtn *BitBtnCancel;\r
     TEdit *EditDevice;\r
+    TCSpinEdit *SpinEditTitle;\r
+    TCSpinEdit *SpinEditChapter;\r
     void __fastcall FormShow(TObject *Sender);\r
     void __fastcall FormHide(TObject *Sender);\r
     void __fastcall BitBtnCancelClick(TObject *Sender);\r

diff --git a/plugins/win32/mainframe.cpp b/plugins/win32/mainframe.cpp
index eaa517dc03b5b6b15f03e4a6e0a879932401f810..dc45d0c8d81f667ffc37e4b10fe21d7d3de682aa 100644 (file)
--- a/plugins/win32/mainframe.cpp
+++ b/plugins/win32/mainframe.cpp
@@ -50,6 +50,7 @@
 \r
 //---------------------------------------------------------------------------\r
 //#pragma package(smart_init)\r
+#pragma link "CSPIN"\r
 #pragma resource "*.dfm"\r
 \r
 extern struct intf_thread_s *p_intfGlobal;\r
@@ -529,7 +530,7 @@ void __fastcall TMainFrameDlg::ButtonGoClick( TObject *Sender )
     intf_thread_t *p_intf = p_intfGlobal;\r
     int i_channel;\r
 \r
-    i_channel = UpDownChannel->Position;\r
+    i_channel = SpinEditChannel->Value;\r
     intf_WarnMsg( 3, "intf info: joining channel %d", i_channel );\r
 \r
     vlc_mutex_lock( &p_intf->change_lock );\r
@@ -658,6 +659,10 @@ void __fastcall TMainFrameDlg::ModeManage()
         }\r
         else\r
         {\r
+            /* add space between tolbar and statusbar when\r
+             * nothing is displayed; isn't it nicer ? :) */ \r
+            i_Height += 18;\r
+\r
             /* unsensitize menus */\r
             MenuProgram->Enabled = false;\r
             MenuTitle->Enabled = false;\r

diff --git a/plugins/win32/mainframe.dfm b/plugins/win32/mainframe.dfm
index 72f31868617b07c5a11b41026d2e5032f9516407..eedb921ec1d1e9eaca4c952c3b3942fd34ae0725 100644 (file)
--- a/plugins/win32/mainframe.dfm
+++ b/plugins/win32/mainframe.dfm
@@ -320,39 +320,29 @@ object MainFrameDlg: TMainFrameDlg
     object LabelServer: TLabel\r
       Left = 64\r
       Top = 16\r
-      Width = 52\r
+      Width = 49\r
       Height = 13\r
-      Caption = 'No server !'\r
-    end\r
-    object EditChannel: TEdit\r
-      Left = 336\r
-      Top = 12\r
-      Width = 17\r
-      Height = 21\r
-      TabOrder = 0\r
-      Text = '0'\r
-    end\r
-    object UpDownChannel: TUpDown\r
-      Left = 353\r
-      Top = 12\r
-      Width = 15\r
-      Height = 21\r
-      Associate = EditChannel\r
-      Min = 0\r
-      Position = 0\r
-      TabOrder = 1\r
-      Thousands = False\r
-      Wrap = False\r
+      Caption = 'No server!'\r
     end\r
     object ButtonGo: TButton\r
-      Left = 376\r
+      Left = 384\r
       Top = 10\r
       Width = 25\r
       Height = 25\r
       Caption = 'Go!'\r
-      TabOrder = 2\r
+      TabOrder = 0\r
       OnClick = ButtonGoClick\r
     end\r
+    object SpinEditChannel: TCSpinEdit\r
+      Left = 336\r
+      Top = 11\r
+      Width = 41\r
+      Height = 22\r
+      TabStop = True\r
+      MaxValue = 99\r
+      ParentColor = False\r
+      TabOrder = 1\r
+    end\r
   end\r
   object GroupBoxDisc: TGroupBox\r
     Left = 0\r

diff --git a/plugins/win32/mainframe.h b/plugins/win32/mainframe.h
index 61a7ac351d59baf509427c0e69d6d34eb6142094..7833d6c606afeba01f23f123cc79cc7fd3aaa0e0 100644 (file)
--- a/plugins/win32/mainframe.h
+++ b/plugins/win32/mainframe.h
@@ -35,6 +35,7 @@
 #include <ToolWin.hpp>\r
 #include <AppEvnts.hpp>\r
 #include <ExtCtrls.hpp>\r
+#include "CSPIN.h"\r
 //---------------------------------------------------------------------------\r
 class TMainFrameDlg : public TForm\r
 {\r
@@ -109,8 +110,6 @@ __published:        // IDE-managed Components
     TGroupBox *GroupBoxFile;\r
     TLabel *LabelFileName;\r
     TGroupBox *GroupBoxNetwork;\r
-    TEdit *EditChannel;\r
-    TUpDown *UpDownChannel;\r
     TLabel *LabelChannel;\r
     TLabel *LabelServer;\r
     TGroupBox *GroupBoxDisc;\r
@@ -135,6 +134,7 @@ __published:        // IDE-managed Components
     TMenuItem *PopupNetworkStream;\r
     TMenuItem *PopupClose;\r
     TMenuItem *N9;\r
+    TCSpinEdit *SpinEditChannel;\r
     void __fastcall TimerManageTimer( TObject *Sender );\r
     void __fastcall TrackBarChange( TObject *Sender );\r
     void __fastcall FormClose( TObject *Sender, TCloseAction &Action );\r

diff --git a/plugins/win32/network.cpp b/plugins/win32/network.cpp
index 6b6cc414a9f92f2e2177c497bc41270e7345906c..516277fef23e2b9f89ef031a3516a928a22c22d6 100644 (file)
--- a/plugins/win32/network.cpp
+++ b/plugins/win32/network.cpp
@@ -38,6 +38,7 @@
 \r
 //---------------------------------------------------------------------------\r
 //#pragma package(smart_init)\r
+#pragma link "CSPIN"\r
 #pragma resource "*.dfm"\r
 \r
 extern struct intf_thread_s *p_intfGlobal;\r
@@ -51,8 +52,8 @@ __fastcall TNetworkDlg::TNetworkDlg( TComponent* Owner )
         OldRadioValue = 0;\r
 \r
         /* server port */\r
-        UpDownUDPPort->Position = config_GetIntVariable( "server-port" );\r
-        UpDownMulticastPort->Position = config_GetIntVariable( "server-port" );\r
+        SpinEditUDPPort->Value = config_GetIntVariable( "server-port" );\r
+        SpinEditMulticastPort->Value = config_GetIntVariable( "server-port" );\r
 \r
         /* channel server */\r
         if( config_GetIntVariable( "network-channel" ) )\r
@@ -68,7 +69,7 @@ __fastcall TNetworkDlg::TNetworkDlg( TComponent* Owner )
             free( psz_channel_server );\r
         }\r
 \r
-        UpDownCSPort->Position = config_GetIntVariable( "channel-port" );\r
+        SpinEditCSPort->Value = config_GetIntVariable( "channel-port" );\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TNetworkDlg::FormShow( TObject *Sender )\r
@@ -92,7 +93,7 @@ void __fastcall TNetworkDlg::BitBtnOkClick( TObject *Sender )
 {\r
     AnsiString      Source, Address;\r
     AnsiString      Channel = ComboBoxCSAddress->Text;\r
-    unsigned int    i_channel_port = UpDownCSPort->Position;\r
+    unsigned int    i_channel_port = SpinEditCSPort->Value;\r
     unsigned int    i_port;\r
     int             i_end = p_main->p_playlist->i_size;\r
 \r
@@ -110,7 +111,7 @@ void __fastcall TNetworkDlg::BitBtnOkClick( TObject *Sender )
         /* UDP */\r
         case 0:\r
             config_PutIntVariable( "network-channel", FALSE );\r
-            i_port = UpDownUDPPort->Position;\r
+            i_port = SpinEditUDPPort->Value;\r
 \r
             /* Build source name */\r
             Source = "udp:@:" + IntToStr( i_port );\r
@@ -127,7 +128,7 @@ void __fastcall TNetworkDlg::BitBtnOkClick( TObject *Sender )
         case 1:\r
             config_PutIntVariable( "network-channel", FALSE );\r
             Address = ComboBoxMulticastAddress->Text;\r
-            i_port = UpDownMulticastPort->Position;\r
+            i_port = SpinEditMulticastPort->Value;\r
 \r
             /* Build source name */\r
             Source = "udp:@" + Address + ":" + IntToStr( i_port );\r
@@ -178,8 +179,7 @@ void __fastcall TNetworkDlg::ChangeEnabled( int i_selected )
     {\r
         case 0:\r
             LabelUDPPort->Enabled = NOT( LabelUDPPort->Enabled );\r
-            EditUDPPort->Enabled = NOT( EditUDPPort->Enabled );\r
-            UpDownUDPPort->Enabled = NOT( UpDownUDPPort->Enabled );\r
+            SpinEditUDPPort->Enabled = NOT( SpinEditUDPPort->Enabled );\r
             break;\r
         case 1:\r
             LabelMulticastAddress->Enabled =\r
@@ -187,15 +187,13 @@ void __fastcall TNetworkDlg::ChangeEnabled( int i_selected )
             ComboBoxMulticastAddress->Enabled =\r
                     NOT( ComboBoxMulticastAddress->Enabled );\r
             LabelMulticastPort->Enabled = NOT( LabelMulticastPort->Enabled );\r
-            EditMulticastPort->Enabled = NOT( EditMulticastPort->Enabled );\r
-            UpDownMulticastPort->Enabled = NOT( UpDownMulticastPort->Enabled );\r
+            SpinEditMulticastPort->Enabled = NOT( SpinEditMulticastPort->Enabled );\r
             break;\r
         case 2:\r
             LabelCSAddress->Enabled = NOT( LabelCSAddress->Enabled );\r
             ComboBoxCSAddress->Enabled = NOT( ComboBoxCSAddress->Enabled );\r
             LabelCSPort->Enabled = NOT( LabelCSPort->Enabled );\r
-            EditCSPort->Enabled = NOT( EditCSPort->Enabled );\r
-            UpDownCSPort->Enabled = NOT( UpDownCSPort->Enabled );\r
+            SpinEditCSPort->Enabled = NOT( SpinEditCSPort->Enabled );\r
             break;\r
         case 3:\r
             LabelHTTPURL->Enabled = NOT( LabelHTTPURL->Enabled );\r

diff --git a/plugins/win32/network.dfm b/plugins/win32/network.dfm
index 7e3d5e4c83012996fbe9cc2fd83d9791e3096c16..9a394d2977ba599d1d3ca8d7946a59db97c553d9 100644 (file)
--- a/plugins/win32/network.dfm
+++ b/plugins/win32/network.dfm
@@ -1,9 +1,9 @@
 object NetworkDlg: TNetworkDlg\r
-  Left = 353\r
-  Top = 273\r
+  Left = 369\r
+  Top = 301\r
   BorderStyle = bsDialog\r
   Caption = 'Open network'\r
-  ClientHeight = 222\r
+  ClientHeight = 206\r
   ClientWidth = 482\r
   Color = clBtnFace\r
   Font.Charset = DEFAULT_CHARSET\r
@@ -249,7 +249,7 @@ object NetworkDlg: TNetworkDlg
   TextHeight = 13\r
   object BitBtnOk: TBitBtn\r
     Left = 40\r
-    Top = 184\r
+    Top = 168\r
     Width = 177\r
     Height = 25\r
     TabOrder = 0\r
@@ -258,7 +258,7 @@ object NetworkDlg: TNetworkDlg
   end\r
   object BitBtnCancel: TBitBtn\r
     Left = 256\r
-    Top = 184\r
+    Top = 168\r
     Width = 177\r
     Height = 25\r
     TabOrder = 1\r
@@ -269,19 +269,19 @@ object NetworkDlg: TNetworkDlg
     Left = 8\r
     Top = 8\r
     Width = 465\r
-    Height = 161\r
+    Height = 145\r
     Caption = 'Network mode'\r
     TabOrder = 2\r
     object LabelUDPPort: TLabel\r
       Left = 148\r
-      Top = 34\r
+      Top = 26\r
       Width = 22\r
       Height = 13\r
       Caption = 'Port:'\r
     end\r
     object LabelMulticastPort: TLabel\r
       Left = 364\r
-      Top = 66\r
+      Top = 54\r
       Width = 22\r
       Height = 13\r
       Caption = 'Port:'\r
@@ -289,7 +289,7 @@ object NetworkDlg: TNetworkDlg
     end\r
     object LabelCSPort: TLabel\r
       Left = 364\r
-      Top = 98\r
+      Top = 82\r
       Width = 22\r
       Height = 13\r
       Caption = 'Port:'\r
@@ -297,7 +297,7 @@ object NetworkDlg: TNetworkDlg
     end\r
     object LabelMulticastAddress: TLabel\r
       Left = 139\r
-      Top = 66\r
+      Top = 54\r
       Width = 41\r
       Height = 13\r
       Caption = 'Address:'\r
@@ -305,7 +305,7 @@ object NetworkDlg: TNetworkDlg
     end\r
     object LabelCSAddress: TLabel\r
       Left = 139\r
-      Top = 98\r
+      Top = 82\r
       Width = 41\r
       Height = 13\r
       Caption = 'Address:'\r
@@ -313,7 +313,7 @@ object NetworkDlg: TNetworkDlg
     end\r
     object LabelHTTPURL: TLabel\r
       Left = 147\r
-      Top = 130\r
+      Top = 110\r
       Width = 25\r
       Height = 13\r
       Caption = 'URL:'\r
@@ -321,7 +321,7 @@ object NetworkDlg: TNetworkDlg
     end\r
     object RadioButtonUDP: TRadioButton\r
       Left = 16\r
-      Top = 32\r
+      Top = 24\r
       Width = 97\r
       Height = 17\r
       Caption = 'UDP'\r
@@ -332,7 +332,7 @@ object NetworkDlg: TNetworkDlg
     end\r
     object RadioButtonMulticast: TRadioButton\r
       Left = 16\r
-      Top = 64\r
+      Top = 52\r
       Width = 97\r
       Height = 17\r
       Caption = 'UDP Multicast'\r
@@ -341,7 +341,7 @@ object NetworkDlg: TNetworkDlg
     end\r
     object RadioButtonCS: TRadioButton\r
       Left = 16\r
-      Top = 96\r
+      Top = 80\r
       Width = 97\r
       Height = 17\r
       Caption = 'Channel Server'\r
@@ -350,108 +350,76 @@ object NetworkDlg: TNetworkDlg
     end\r
     object RadioButtonHTTP: TRadioButton\r
       Left = 16\r
-      Top = 128\r
+      Top = 108\r
       Width = 97\r
       Height = 17\r
       Caption = 'HTTP'\r
       TabOrder = 3\r
       OnEnter = RadioButtonHTTPEnter\r
     end\r
-    object EditUDPPort: TEdit\r
-      Left = 184\r
-      Top = 30\r
-      Width = 41\r
-      Height = 21\r
-      TabOrder = 4\r
-      Text = '1234'\r
-    end\r
-    object UpDownUDPPort: TUpDown\r
-      Left = 225\r
-      Top = 30\r
-      Width = 16\r
-      Height = 21\r
-      Associate = EditUDPPort\r
-      Min = 0\r
-      Max = 32767\r
-      Position = 1234\r
-      TabOrder = 5\r
-      Thousands = False\r
-      Wrap = False\r
-    end\r
-    object EditMulticastPort: TEdit\r
-      Left = 392\r
-      Top = 62\r
-      Width = 41\r
-      Height = 21\r
-      Enabled = False\r
-      TabOrder = 7\r
-      Text = '1234'\r
-    end\r
-    object UpDownMulticastPort: TUpDown\r
-      Left = 433\r
-      Top = 62\r
-      Width = 16\r
-      Height = 21\r
-      Associate = EditMulticastPort\r
-      Enabled = False\r
-      Min = 0\r
-      Max = 32767\r
-      Position = 1234\r
-      TabOrder = 8\r
-      Thousands = False\r
-      Wrap = False\r
-    end\r
-    object EditCSPort: TEdit\r
-      Left = 392\r
-      Top = 94\r
-      Width = 41\r
-      Height = 21\r
-      Enabled = False\r
-      TabOrder = 10\r
-      Text = '6010'\r
-    end\r
-    object UpDownCSPort: TUpDown\r
-      Left = 433\r
-      Top = 94\r
-      Width = 16\r
-      Height = 21\r
-      Associate = EditCSPort\r
-      Enabled = False\r
-      Min = 0\r
-      Max = 32767\r
-      Position = 6010\r
-      TabOrder = 11\r
-      Thousands = False\r
-      Wrap = False\r
-    end\r
     object ComboBoxMulticastAddress: TComboBox\r
       Left = 184\r
-      Top = 62\r
+      Top = 50\r
       Width = 161\r
       Height = 21\r
       Enabled = False\r
       ItemHeight = 13\r
-      TabOrder = 6\r
+      TabOrder = 5\r
     end\r
     object ComboBoxCSAddress: TComboBox\r
       Left = 184\r
-      Top = 94\r
+      Top = 78\r
       Width = 161\r
       Height = 21\r
       Enabled = False\r
       ItemHeight = 13\r
-      TabOrder = 9\r
+      TabOrder = 7\r
       Text = '138.195.156.230'\r
       Items.Strings = (\r
         '138.195.159.230')\r
     end\r
     object EditHTTPURL: TEdit\r
       Left = 184\r
-      Top = 126\r
+      Top = 106\r
       Width = 265\r
       Height = 21\r
       Enabled = False\r
-      TabOrder = 12\r
+      TabOrder = 9\r
+    end\r
+    object SpinEditUDPPort: TCSpinEdit\r
+      Left = 184\r
+      Top = 21\r
+      Width = 57\r
+      Height = 22\r
+      TabStop = True\r
+      MaxValue = 65535\r
+      ParentColor = False\r
+      TabOrder = 4\r
+      Value = 1234\r
+    end\r
+    object SpinEditMulticastPort: TCSpinEdit\r
+      Left = 392\r
+      Top = 49\r
+      Width = 57\r
+      Height = 22\r
+      TabStop = True\r
+      Enabled = False\r
+      MaxValue = 65535\r
+      ParentColor = False\r
+      TabOrder = 6\r
+      Value = 1234\r
+    end\r
+    object SpinEditCSPort: TCSpinEdit\r
+      Left = 392\r
+      Top = 77\r
+      Width = 57\r
+      Height = 22\r
+      TabStop = True\r
+      Enabled = False\r
+      MaxValue = 65535\r
+      ParentColor = False\r
+      TabOrder = 8\r
+      Value = 6010\r
     end\r
   end\r
 end\r

diff --git a/plugins/win32/network.h b/plugins/win32/network.h
index 2ccf4d69309d6bebfad9fd58089a07cb2e91d3ce..45c50572b4aa32921a25bc5f091134331e8e625f 100644 (file)
--- a/plugins/win32/network.h
+++ b/plugins/win32/network.h
@@ -30,6 +30,7 @@
 #include <Buttons.hpp>\r
 #include <ComCtrls.hpp>\r
 #include <ExtCtrls.hpp>\r
+#include "CSPIN.h"\r
 //---------------------------------------------------------------------------\r
 \r
 #define NOT( var ) ( (var) ? false : true )\r
@@ -45,20 +46,17 @@ __published:        // IDE-managed Components
     TRadioButton *RadioButtonCS;\r
     TRadioButton *RadioButtonHTTP;\r
     TLabel *LabelUDPPort;\r
-    TEdit *EditUDPPort;\r
-    TUpDown *UpDownUDPPort;\r
     TLabel *LabelMulticastPort;\r
-    TEdit *EditMulticastPort;\r
-    TUpDown *UpDownMulticastPort;\r
     TLabel *LabelCSPort;\r
-    TEdit *EditCSPort;\r
-    TUpDown *UpDownCSPort;\r
     TLabel *LabelMulticastAddress;\r
     TComboBox *ComboBoxMulticastAddress;\r
     TLabel *LabelCSAddress;\r
     TComboBox *ComboBoxCSAddress;\r
     TEdit *EditHTTPURL;\r
     TLabel *LabelHTTPURL;\r
+    TCSpinEdit *SpinEditUDPPort;\r
+    TCSpinEdit *SpinEditMulticastPort;\r
+    TCSpinEdit *SpinEditCSPort;\r
     void __fastcall FormShow( TObject *Sender );\r
     void __fastcall FormHide( TObject *Sender );\r
     void __fastcall BitBtnCancelClick( TObject *Sender );\r

diff --git a/plugins/win32/preferences.cpp b/plugins/win32/preferences.cpp
index dc6c4b78a07a290642c13f28948dba6a19313100..aecdf5f60d924ba182d9bcc85620aa9696101a30 100644 (file)
--- a/plugins/win32/preferences.cpp
+++ b/plugins/win32/preferences.cpp
@@ -35,6 +35,7 @@
 \r
 //---------------------------------------------------------------------------\r
 //#pragma package(smart_init)\r
+#pragma link "CSPIN"\r
 #pragma resource "*.dfm"\r
 \r
 extern struct intf_thread_s *p_intfGlobal;\r
@@ -117,16 +118,20 @@ TEdit * __fastcall TGroupBoxPref::CreateEdit( TWinControl *Parent,
     return Edit;\r
 }\r
 //---------------------------------------------------------------------------\r
-TUpDown * __fastcall TGroupBoxPref::CreateUpDown( TWinControl *Parent,\r
-            int Min, int Max, int Position, bool Thousands )\r
+TCSpinEdit * __fastcall TGroupBoxPref::CreateSpinEdit( TWinControl *Parent,\r
+            int Left, int Width, int Top, int Height,\r
+            long Min, long Max, long Value )\r
 {\r
-    TUpDown *UpDown = new TUpDown( Parent );\r
-    UpDown->Parent = Parent;\r
-    UpDown->Min = Min;\r
-    UpDown->Max = Max;\r
-    UpDown->Position = Position;\r
-    UpDown->Thousands = Thousands;\r
-    return UpDown;\r
+    TCSpinEdit *SpinEdit = new TCSpinEdit( Parent );\r
+    SpinEdit->Parent = Parent;\r
+    SpinEdit->Left = Left;\r
+    SpinEdit->Width = Width;\r
+    SpinEdit->Top = Top;\r
+    SpinEdit->Height = Height;\r
+    SpinEdit->MinValue = Min;\r
+    SpinEdit->MaxValue = Max;\r
+    SpinEdit->Value = Value;\r
+    return SpinEdit;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TGroupBoxPref::UpdateChanges()\r
@@ -264,22 +269,20 @@ __fastcall TGroupBoxInteger::TGroupBoxInteger( TComponent* Owner,
     LabelDesc = CreateLabel( this, 230, 225, 19, 26,\r
                              p_config->psz_longtext, true );\r
 \r
-    /* init edit */\r
-    Edit = CreateEdit( this, 16, 148, 24, 21, "" );\r
-\r
-    /* init updown */\r
-    UpDown = CreateUpDown( this, -1, 32767, p_config->i_value, false );\r
-    UpDown->Associate = Edit;\r
+    /* init spinedit */\r
+    SpinEdit = CreateSpinEdit( this, 16, 164, 24, 21,\r
+                               -1, 100000, p_config->i_value );\r
 \r
     /* vertical alignment */\r
     Height = LabelDesc->Height + 24;\r
     LabelDesc->Top = Top + ( Height - LabelDesc->Height ) / 2 + 4;\r
-    Edit->Top = Top + ( Height - Edit->Height ) / 2 + 4;\r
+    SpinEdit->Top = Top + ( Height - SpinEdit->Height ) / 2 + 4;\r
 };\r
 //---------------------------------------------------------------------------\r
 void __fastcall TGroupBoxInteger::UpdateChanges()\r
 {\r
-    p_config->i_value = StrToInt( Edit->Text );\r
+    /* Warning: we're casting from long to int */\r
+    p_config->i_value = (int)SpinEdit->Value;\r
 }\r
 \r
 \r

diff --git a/plugins/win32/preferences.h b/plugins/win32/preferences.h
index f0a3ca3142f145d32cd85ff67540ed0430f0990f..9dbb92db1725fab8a6653116c538312374b2ef80 100644 (file)
--- a/plugins/win32/preferences.h
+++ b/plugins/win32/preferences.h
@@ -30,6 +30,7 @@
 #include <Buttons.hpp>\r
 #include <ComCtrls.hpp>\r
 #include <ExtCtrls.hpp>\r
+#include "CSPIN.h"\r
 //---------------------------------------------------------------------------\r
 class TGroupBoxPref : public TGroupBox\r
 {\r
@@ -48,8 +49,9 @@ public:
             bool WordWrap );\r
     TEdit * __fastcall CreateEdit( TWinControl *Parent,\r
             int Left, int Width, int Top, int Height, AnsiString Text );\r
-    TUpDown * __fastcall CreateUpDown( TWinControl *Parent,\r
-            int Min, int Max, int Position, bool Thousands );\r
+    TCSpinEdit * __fastcall CreateSpinEdit( TWinControl *Parent,\r
+            int Left, int Width, int Top, int Height,\r
+            long Min, long Max, long Value );\r
 };\r
 //---------------------------------------------------------------------------\r
 class TGroupBoxPlugin : public TGroupBoxPref\r
@@ -85,8 +87,7 @@ class TGroupBoxInteger : public TGroupBoxPref
 public:\r
     __fastcall TGroupBoxInteger( TComponent* Owner, module_config_t *p_config );\r
     TLabel *LabelDesc;\r
-    TEdit *Edit;\r
-    TUpDown *UpDown;\r
+    TCSpinEdit *SpinEdit;\r
     void __fastcall UpdateChanges();\r
 };\r
 //---------------------------------------------------------------------------\r