Changeset 5120


Ignore:
Timestamp:
03/12/10 18:55:16 (10 years ago)
Author:
ronosman
Message:

Various GUI improvements : Frame MinSize, only disable properties and tags when no selected photo.

Location:
extensions/pLoader/trunk/src/Uploader/GUI
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/pLoader/trunk/src/Uploader/GUI/Frame.pm

    r5114 r5120  
    135135use Uploader::GUI::wxImageListCtrl; 
    136136use Uploader::GUI::wxPropertyListDlg; 
    137 use Uploader::GUI::wxHtmlWindow; 
    138137use Uploader::GUI::wxGlobalSettings; 
    139138use Uploader::GUI::wxImagePreview; 
     
    294293                $self->imageviewer_item_refresh(0); 
    295294            } 
     295 
     296            if(!scalar @{$self->imageviewer->GetSelectedItems} and $self->dlg_piwigo_photo_properties->{_properties_notebook}->IsEnabled){ 
     297                $self->dlg_piwigo_photo_properties->{_properties_notebook}->Enable(0); 
     298            } 
     299 
    296300 
    297301            $self->OnUpdateToolbar; 
     
    787791        $self 
    788792    ); 
    789     $self->SetMinSize([600, 500]); 
     793    $self->SetMinSize([600, 660]); 
    790794    $self->Center; 
    791795} 
     
    794798    my ( $self ) = @_; 
    795799 
    796     $self->dlg_piwigo_photo_properties->Enable(0); 
     800    $self->dlg_piwigo_photo_properties->{_properties_notebook}->Enable(0); 
    797801    $self->imageviewer->OnEmpty; 
    798802} 
     
    801805    my ( $self ) = @_; 
    802806 
    803     $self->dlg_piwigo_photo_properties->Enable(1); 
     807    $self->dlg_piwigo_photo_properties->{_properties_notebook}->Enable(1); 
    804808    $self->imageviewer->OnNotEmpty; 
    805809} 
     
    11781182    Wx::Event::EVT_MENU( $self, 103, \&OnUploadImages ); 
    11791183    Wx::Event::EVT_MENU( $self, 104, \&OnGlobalSettings ); 
    1180     Wx::Event::EVT_MENU( $self, 105, \&OnChooseLanguage ); 
     1184    #Wx::Event::EVT_MENU( $self, 105, \&OnChooseLanguage ); 
    11811185    Wx::Event::EVT_CHOICE( $self, 106, \&OnPhotoSelMode ); 
    11821186    Wx::Event::EVT_TREE_SEL_CHANGED( $self, $self->tree, \&OnTreeSelChanged ); 
     
    15061510    my $bc = Wx::BusyCursor->new; 
    15071511    my $indx = $event->GetIndex; 
     1512 
     1513    $self->dlg_piwigo_photo_properties->{_properties_notebook}->Enable(1)  
     1514        if !$self->dlg_piwigo_photo_properties->{_properties_notebook}->IsEnabled; 
    15081515    $self->_on_imageviewer_item_selected($indx); 
    15091516 
     
    19381945        [ 
    19391946            101,  
    1940             gettext("Add photo to selection"),  
     1947            gettext("Add photo"),  
    19411948            wxTheApp->resource_path('tb_add.png'),  
    19421949            wxBITMAP_TYPE_PNG,  
    19431950            1,  
    19441951            wxTheApp->resource_path('tb_add.png'),  
    1945             gettext("Add photo to selection for resizing and uploading") 
     1952            gettext("Add photo for resizing and uploading") 
    19461953        ], 
    19471954        [ 
    19481955            102,  
    1949             gettext("Remove photo from selection"),  
     1956            gettext("Remove selected photos"),  
    19501957            wxTheApp->resource_path('tb_remove.png'),  
    19511958            wxBITMAP_TYPE_PNG,  
     
    19651972        [ 
    19661973            104,  
    1967             gettext("Global settings"),  
     1974            gettext("Preferences"),  
    19681975            wxTheApp->resource_path('tb_settings.png'),  
    19691976            wxBITMAP_TYPE_PNG,  
     
    19721979            gettext("Change global settings.") 
    19731980        ], 
    1974         [ 
    1975             105,  
    1976             gettext("Language choice"),  
    1977             wxTheApp->resource_path('tb_i18n.png'),  
    1978             wxBITMAP_TYPE_PNG,  
    1979             1,  
    1980             wxTheApp->resource_path('tb_i18n.png'), 
    1981             gettext("Language choice") 
    1982         ], 
     1981#        [ 
     1982#            105,  
     1983#            gettext("Language choice"),  
     1984#            wxTheApp->resource_path('tb_i18n.png'),  
     1985#            wxBITMAP_TYPE_PNG,  
     1986#            1,  
     1987#            wxTheApp->resource_path('tb_i18n.png'), 
     1988#            gettext("Language choice") 
     1989#        ], 
    19831990     
    19841991    ); 
  • extensions/pLoader/trunk/src/Uploader/GUI/Layout/GlobalSettings.pm

    r4974 r5120  
    465465} 
    466466 
    467 # Menu bar functions 
    468  
    469  
    470 # Toolbar functions 
    471  
    472 use Wx qw( wxITEM_NORMAL wxITEM_RADIO wxITEM_CHECK ); 
    473  
    474  
    475 # End of generated file 
  • extensions/pLoader/trunk/src/Uploader/GUI/Layout/PhotoPropertiesCategoriesTags.pm

    r5103 r5120  
    5656        $item1 = Wx::NotebookSizer->new( $item2 ); 
    5757    } 
     58    $parent->{_properties_notebook} = $item2; 
    5859     
    5960    # the notebook has adaptive size : stretch factor 2, wxEXPAND 
Note: See TracChangeset for help on using the changeset viewer.