-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 72 | ||||
-rw-r--r-- | pics/appearance/advanced.png | bin | 584 -> 0 bytes |
2 files changed, 36 insertions, 36 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp index 2b35119..8dc70ee 100644 --- a/noncore/settings/appearance2/appearance.cpp +++ b/noncore/settings/appearance2/appearance.cpp | |||
@@ -421,12 +421,12 @@ Appearance::Appearance( QWidget* parent, const char* name, WFlags ) | |||
421 | OTabWidget* tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); | 421 | OTabWidget* tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); |
422 | QWidget *styletab; | 422 | QWidget *styletab; |
423 | 423 | ||
424 | m_color_list = 0; | 424 | m_color_list = 0; |
425 | 425 | ||
426 | tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance/style", tr( "Style" )); | 426 | tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance/style", tr( "Style" )); |
427 | tw-> addTab ( createFontTab ( tw, config ), "appearance/font", tr( "Font" )); | 427 | tw-> addTab ( createFontTab ( tw, config ), "appearance/font", tr( "Font" )); |
428 | tw-> addTab ( createColorTab ( tw, config ), "appearance/color", tr( "Colors" ) ); | 428 | tw-> addTab ( createColorTab ( tw, config ), "appearance/color", tr( "Colors" ) ); |
429 | tw-> addTab ( createDecoTab ( tw, config ), "appearance/deco", tr( "Windows" ) ); | 429 | tw-> addTab ( createDecoTab ( tw, config ), "appearance/deco", tr( "Windows" ) ); |
430 | tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "appearance/advanced", tr( "Advanced" ) ); | 430 | tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "SettingsIcon", tr( "Advanced" ) ); |
431 | 431 | ||
432 | top-> addWidget ( tw, 10 ); | 432 | top-> addWidget ( tw, 10 ); |
@@ -531,11 +531,11 @@ void Appearance::styleClicked ( int index ) | |||
531 | StyleListItem *sli = (StyleListItem *) m_style_list-> item ( index ); | 531 | StyleListItem *sli = (StyleListItem *) m_style_list-> item ( index ); |
532 | m_style_settings-> setEnabled ( sli ? sli-> hasSettings ( ) : false ); | 532 | m_style_settings-> setEnabled ( sli ? sli-> hasSettings ( ) : false ); |
533 | 533 | ||
534 | if ( m_sample && sli && sli-> style ( )) { | 534 | if ( m_sample && sli && sli-> style ( )) { |
535 | int ci = m_color_list ? m_color_list-> currentItem ( ) : -1; | 535 | int ci = m_color_list ? m_color_list-> currentItem ( ) : -1; |
536 | 536 | ||
537 | m_sample-> setStyle2 ( sli-> style ( ), ci < 0 ? palette ( ) : ((ColorListItem *) m_color_list-> item ( ci ))-> palette ( )); | 537 | m_sample-> setStyle2 ( sli-> style ( ), ci < 0 ? palette ( ) : ((ColorListItem *) m_color_list-> item ( ci ))-> palette ( )); |
538 | } | 538 | } |
539 | 539 | ||
540 | m_style_changed |= ( index != m_original_style ); | 540 | m_style_changed |= ( index != m_original_style ); |
541 | } | 541 | } |
@@ -569,8 +569,8 @@ void Appearance::decoClicked ( int index ) | |||
569 | { | 569 | { |
570 | DecoListItem *dli = (DecoListItem *) m_deco_list-> item ( index ); | 570 | DecoListItem *dli = (DecoListItem *) m_deco_list-> item ( index ); |
571 | 571 | ||
572 | if ( m_sample ) { | 572 | if ( m_sample ) { |
573 | if ( dli && dli-> interface ( )) | 573 | if ( dli && dli-> interface ( )) |
574 | m_sample-> setDecoration ( dli-> interface ( )); | 574 | m_sample-> setDecoration ( dli-> interface ( )); |
575 | else | 575 | else |
576 | m_sample-> setDecoration ( new DefaultWindowDecoration ( )); | 576 | m_sample-> setDecoration ( new DefaultWindowDecoration ( )); |
@@ -582,5 +582,5 @@ void Appearance::decoClicked ( int index ) | |||
582 | void Appearance::fontClicked ( const QFont &f ) | 582 | void Appearance::fontClicked ( const QFont &f ) |
583 | { | 583 | { |
584 | m_font_changed |= ( f != m_sample-> font ( )); | 584 | m_font_changed |= ( f != m_sample-> font ( )); |
585 | m_sample-> setFont ( f ); | 585 | m_sample-> setFont ( f ); |
586 | } | 586 | } |
@@ -604,12 +604,12 @@ void Appearance::editSchemeClicked ( ) | |||
604 | QString labels [QColorGroup::NColorRoles]; | 604 | QString labels [QColorGroup::NColorRoles]; |
605 | QColor colors [QColorGroup::NColorRoles]; | 605 | QColor colors [QColorGroup::NColorRoles]; |
606 | 606 | ||
607 | for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) { | 607 | for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) { |
608 | QColor col = item-> color ( role ); | 608 | QColor col = item-> color ( role ); |
609 | 609 | ||
610 | if ( col. isValid ( )) { | 610 | if ( col. isValid ( )) { |
611 | labels [cnt] = item-> label ( role ); | 611 | labels [cnt] = item-> label ( role ); |
612 | colors [cnt] = col; | 612 | colors [cnt] = col; |
613 | 613 | ||
614 | cnt++; | 614 | cnt++; |
615 | } | 615 | } |
@@ -621,5 +621,5 @@ void Appearance::editSchemeClicked ( ) | |||
621 | ColorListItem *citem = (ColorListItem *) m_color_list-> item ( 0 ); | 621 | ColorListItem *citem = (ColorListItem *) m_color_list-> item ( 0 ); |
622 | cnt = 0; | 622 | cnt = 0; |
623 | 623 | ||
624 | for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) { | 624 | for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) { |
625 | if ( item-> color ( role ). isValid ( )) { | 625 | if ( item-> color ( role ). isValid ( )) { |
@@ -628,8 +628,8 @@ void Appearance::editSchemeClicked ( ) | |||
628 | } | 628 | } |
629 | } | 629 | } |
630 | 630 | ||
631 | m_color_list-> setCurrentItem ( 0 ); | 631 | m_color_list-> setCurrentItem ( 0 ); |
632 | colorClicked ( 0 ); | 632 | colorClicked ( 0 ); |
633 | 633 | ||
634 | m_color_changed = true; | 634 | m_color_changed = true; |
635 | } | 635 | } |
@@ -659,14 +659,14 @@ void Appearance::saveSchemeClicked() | |||
659 | QFile file ( filestr ); | 659 | QFile file ( filestr ); |
660 | if ( !file. exists ( )) | 660 | if ( !file. exists ( )) |
661 | { | 661 | { |
662 | QPalette p = item-> palette ( ); | 662 | QPalette p = item-> palette ( ); |
663 | 663 | ||
664 | Config config ( file.name(), Config::File ); | 664 | Config config ( file.name(), Config::File ); |
665 | config. setGroup( "Colors" ); | 665 | config. setGroup( "Colors" ); |
666 | 666 | ||
667 | item-> save ( config ); | 667 | item-> save ( config ); |
668 | 668 | ||
669 | config. write ( ); // need to flush the config info first | 669 | config. write ( ); // need to flush the config info first |
670 | 670 | ||
671 | m_color_list-> insertItem ( new ColorListItem ( schemename, config )); | 671 | m_color_list-> insertItem ( new ColorListItem ( schemename, config )); |
672 | } | 672 | } |
@@ -723,5 +723,5 @@ void Appearance::upExcept ( ) | |||
723 | { | 723 | { |
724 | ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( ); | 724 | ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( ); |
725 | 725 | ||
726 | if ( it && it-> itemAbove ( )) | 726 | if ( it && it-> itemAbove ( )) |
727 | it-> itemAbove ( )-> moveItem ( it ); | 727 | it-> itemAbove ( )-> moveItem ( it ); |
@@ -731,5 +731,5 @@ void Appearance::downExcept ( ) | |||
731 | { | 731 | { |
732 | ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( ); | 732 | ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( ); |
733 | 733 | ||
734 | if ( it && it-> itemBelow ( )) | 734 | if ( it && it-> itemBelow ( )) |
735 | it-> moveItem ( it-> itemBelow ( )); | 735 | it-> moveItem ( it-> itemBelow ( )); |
@@ -738,23 +738,23 @@ void Appearance::downExcept ( ) | |||
738 | class ExEdit : public QLineEdit { | 738 | class ExEdit : public QLineEdit { |
739 | public: | 739 | public: |
740 | ExEdit ( ExceptListItem *item ) | 740 | ExEdit ( ExceptListItem *item ) |
741 | : QLineEdit ( item-> listView ( )-> viewport ( ), "exedit" ), it ( item ) | 741 | : QLineEdit ( item-> listView ( )-> viewport ( ), "exedit" ), it ( item ) |
742 | { | 742 | { |
743 | setFrame ( false ); | 743 | setFrame ( false ); |
744 | 744 | ||
745 | QRect r = it-> listView ( )-> itemRect ( it ); | 745 | QRect r = it-> listView ( )-> itemRect ( it ); |
746 | 746 | ||
747 | int x = it-> listView ( )-> header ( )-> cellPos ( 3 ) - 1; | 747 | int x = it-> listView ( )-> header ( )-> cellPos ( 3 ) - 1; |
748 | int y = r. y ( ); | 748 | int y = r. y ( ); |
749 | int w = it-> listView ( )-> viewport ( )-> width ( ) - x; | 749 | int w = it-> listView ( )-> viewport ( )-> width ( ) - x; |
750 | int h = r. height ( ); // + 2; | 750 | int h = r. height ( ); // + 2; |
751 | 751 | ||
752 | setText ( it-> pattern ( )); | 752 | setText ( it-> pattern ( )); |
753 | setGeometry ( x, y, w, h ); | 753 | setGeometry ( x, y, w, h ); |
754 | 754 | ||
755 | qDebug ( "ExEdit: [%s] at %d,%d %d,%d", it->text(2).latin1(),x,y,w,h); | 755 | qDebug ( "ExEdit: [%s] at %d,%d %d,%d", it->text(2).latin1(),x,y,w,h); |
756 | 756 | ||
757 | m_out = true; | 757 | m_out = true; |
758 | 758 | ||
759 | show ( ); | 759 | show ( ); |
760 | setFocus ( ); | 760 | setFocus ( ); |
@@ -762,6 +762,6 @@ public: | |||
762 | end ( true ); | 762 | end ( true ); |
763 | } | 763 | } |
764 | 764 | ||
765 | virtual void focusOutEvent ( QFocusEvent * ) | 765 | virtual void focusOutEvent ( QFocusEvent * ) |
766 | { | 766 | { |
767 | hide ( ); | 767 | hide ( ); |
@@ -770,5 +770,5 @@ public: | |||
770 | delete this; | 770 | delete this; |
771 | } | 771 | } |
772 | 772 | ||
773 | virtual void keyPressEvent ( QKeyEvent *e ) | 773 | virtual void keyPressEvent ( QKeyEvent *e ) |
774 | { | 774 | { |
@@ -782,5 +782,5 @@ public: | |||
782 | QLineEdit::keyPressEvent ( e ); | 782 | QLineEdit::keyPressEvent ( e ); |
783 | } | 783 | } |
784 | 784 | ||
785 | private: | 785 | private: |
786 | ExceptListItem *it; | 786 | ExceptListItem *it; |
diff --git a/pics/appearance/advanced.png b/pics/appearance/advanced.png deleted file mode 100644 index 184fb3a..0000000 --- a/pics/appearance/advanced.png +++ b/dev/null | |||
Binary files differ | |||