Changeset 2697

Timestamp:

Oct 9, 2008, 11:01:03 PM (16 years ago)

Author:

ronosman

Message:

dialogs for rev 2696

Location:

extras/pLoader/trunk/res

Files:

• global_settings_wdr.pl (modified) (3 diffs)
• photo_properties_wdr.pl (modified) (3 diffs)

extras/pLoader/trunk/res/global_settings_wdr.pl

@@ -10 +10 @@
 use Wx qw( wxVERTICAL wxHORIZONTAL wxALL wxLEFT wxRIGHT wxTOP wxBOTTOM wxCENTRE wxGROW wxADJUST_MINSIZE );
 use Wx qw( wxALIGN_RIGHT wxALIGN_BOTTOM wxALIGN_CENTER wxALIGN_CENTER_VERTICAL wxALIGN_CENTER_HORIZONTAL );
-
+use Wx qw( wxRA_SPECIFY_ROWS );
 
 # Bitmap functions
@@ -24 +24 @@
 use vars qw($ID_GLOBAL_RESIZED_W); $ID_GLOBAL_RESIZED_W = 10004;
 use vars qw($ID_GLOBAL_RESIZED_H); $ID_GLOBAL_RESIZED_H = 10005;
+use vars qw($ID_GLOBAL_ROTATE); $ID_GLOBAL_ROTATE = 10006;
+use vars qw($ID_GLOBAL_HIGH); $ID_GLOBAL_HIGH = 10007;
 
 sub GlobalSettings {
@@ -60 +62 @@
     $item1->AddWindow( $item11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
+    my( $item12 ) = Wx::RadioBox->new( $_[0], $main::ID_GLOBAL_ROTATE, "Auto rotate image", wxDefaultPosition, wxDefaultSize, 
+        ["Yes","No"] , 1, wxRA_SPECIFY_ROWS );
+    $item1->AddWindow( $item12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    my( $item13 ) = Wx::RadioBox->new( $_[0], $main::ID_GLOBAL_HIGH, "Upload high (original size) ", wxDefaultPosition, wxDefaultSize, 
+        ["No","Yes"] , 1, wxRA_SPECIFY_ROWS );
+    $item1->AddWindow( $item13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
     $item0->Add( $item1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 

extras/pLoader/trunk/res/photo_properties_wdr.pl

@@ -10 +10 @@
 use Wx qw( wxVERTICAL wxHORIZONTAL wxALL wxLEFT wxRIGHT wxTOP wxBOTTOM wxCENTRE wxGROW wxADJUST_MINSIZE );
 use Wx qw( wxALIGN_RIGHT wxALIGN_BOTTOM wxALIGN_CENTER wxALIGN_CENTER_VERTICAL wxALIGN_CENTER_HORIZONTAL );
-use Wx qw( wxTE_MULTILINE );
+use Wx qw( wxLI_HORIZONTAL wxTE_MULTILINE );
 
 # Bitmap functions
@@ -18 +18 @@
 # Window functions
 
-use vars qw($ID_TEXT); $ID_TEXT = 10000;
-use vars qw($ID_PHOTO_AUTHOR); $ID_PHOTO_AUTHOR = 10001;
-use vars qw($ID_PHOTO_NAME); $ID_PHOTO_NAME = 10002;
-use vars qw($ID_PHOTO_COMMENT); $ID_PHOTO_COMMENT = 10003;
-use vars qw($ID_PHOTO_CREATE_DATE); $ID_PHOTO_CREATE_DATE = 10004;
+use vars qw($ID_PHOTO); $ID_PHOTO = 10000;
+use vars qw($ID_LINE); $ID_LINE = 10001;
+use vars qw($ID_TEXT); $ID_TEXT = 10002;
+use vars qw($ID_PHOTO_AUTHOR); $ID_PHOTO_AUTHOR = 10003;
+use vars qw($ID_PHOTO_NAME); $ID_PHOTO_NAME = 10004;
+use vars qw($ID_PHOTO_COMMENT); $ID_PHOTO_COMMENT = 10005;
+use vars qw($ID_PHOTO_CREATE_DATE); $ID_PHOTO_CREATE_DATE = 10006;
 
 sub PhotoProperties {
@@ -29 +31 @@
     my( $item1 ) = Wx::FlexGridSizer->new( 0, 2, 0, 0 );
     
-    my( $item2 ) = Wx::StaticText->new( $_[0], $main::ID_TEXT, "Author :", wxDefaultPosition, wxDefaultSize, 0 );
+    $item1->AddSpace( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    my( $item2 ) = Wx::StaticBitmap->new( $_[0], $main::ID_PHOTO, wxNullBitmap, wxDefaultPosition, [120,120] );
     $item1->AddWindow( $item2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    my( $item3 ) = Wx::TextCtrl->new( $_[0], $main::ID_PHOTO_AUTHOR, "", wxDefaultPosition, [400,-1], 0 );
-    $item1->AddWindow( $item3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    $item1->AddSpace( 10, 5, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    my( $item4 ) = Wx::StaticText->new( $_[0], $main::ID_TEXT, "Photo name :", wxDefaultPosition, wxDefaultSize, 0 );
+    my( $item3 ) = Wx::StaticLine->new( $_[0], $main::ID_LINE, wxDefaultPosition, [400,-1], wxLI_HORIZONTAL );
+    $item1->AddWindow( $item3, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    my( $item4 ) = Wx::StaticText->new( $_[0], $main::ID_TEXT, "Author :", wxDefaultPosition, wxDefaultSize, 0 );
     $item1->AddWindow( $item4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    my( $item5 ) = Wx::TextCtrl->new( $_[0], $main::ID_PHOTO_NAME, "", wxDefaultPosition, [400,-1], 0 );
-    $item1->AddWindow( $item5, 0, wxALIGN_CENTER|wxALL, 5 );
+    my( $item5 ) = Wx::TextCtrl->new( $_[0], $main::ID_PHOTO_AUTHOR, "", wxDefaultPosition, [400,-1], 0 );
+    $item1->AddWindow( $item5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    my( $item6 ) = Wx::StaticText->new( $_[0], $main::ID_TEXT, "Comment :", wxDefaultPosition, wxDefaultSize, 0 );
-    $item1->AddWindow( $item6, 0, wxALL, 5 );
+    my( $item6 ) = Wx::StaticText->new( $_[0], $main::ID_TEXT, "Photo name :", wxDefaultPosition, wxDefaultSize, 0 );
+    $item1->AddWindow( $item6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    my( $item7 ) = Wx::TextCtrl->new( $_[0], $main::ID_PHOTO_COMMENT, "", wxDefaultPosition, [400,100], wxTE_MULTILINE );
-    $item1->AddWindow( $item7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    my( $item7 ) = Wx::TextCtrl->new( $_[0], $main::ID_PHOTO_NAME, "", wxDefaultPosition, [400,-1], 0 );
+    $item1->AddWindow( $item7, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    my( $item8 ) = Wx::StaticText->new( $_[0], $main::ID_TEXT, "Create date :", wxDefaultPosition, wxDefaultSize, 0 );
-    $item1->AddWindow( $item8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    my( $item8 ) = Wx::StaticText->new( $_[0], $main::ID_TEXT, "Comment :", wxDefaultPosition, wxDefaultSize, 0 );
+    $item1->AddWindow( $item8, 0, wxALL, 5 );
 
-    my( $item9 ) = Wx::StaticText->new( $_[0], $main::ID_PHOTO_CREATE_DATE, "", wxDefaultPosition, [100,-1], 0 );
+    my( $item9 ) = Wx::TextCtrl->new( $_[0], $main::ID_PHOTO_COMMENT, "", wxDefaultPosition, [400,100], wxTE_MULTILINE );
     $item1->AddWindow( $item9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    my( $item10 ) = Wx::StaticText->new( $_[0], $main::ID_TEXT, "Create date :", wxDefaultPosition, wxDefaultSize, 0 );
+    $item1->AddWindow( $item10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    my( $item11 ) = Wx::StaticText->new( $_[0], $main::ID_PHOTO_CREATE_DATE, "", wxDefaultPosition, [100,-1], 0 );
+    $item1->AddWindow( $item11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
     $item0->Add( $item1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );