Compare commits

...

73 Commits

Author SHA1 Message Date
Slávek Banko 905b0b955b
Remove cmake submodule since it has now been replaced by cmake-trinity dependency. 4 months ago
TDE Gitea 301533ef03 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 4 months ago
TDE Gitea 2b692cfe22 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 7 months ago
TDE Gitea 3f20b895ca Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 8 months ago
TDE Gitea 997531b9ae Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 8 months ago
TDE Gitea e519429f48 Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 8 months ago
TDE Gitea d6412bdf81 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 8 months ago
TDE Gitea 8980993244 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 10 months ago
TDE Gitea cb460af3c7 Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 10 months ago
TDE Gitea 91661f1157 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 12 months ago
TDE Gitea c3fc2e13c0 Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 12 months ago
TDE Gitea f482179d2f Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea d8ee09da48 Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 1 year ago
TDE Gitea 1ea8d506f9 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea 2727e42302 Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 1 year ago
TDE Gitea 0679f8769a Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea 8af92894da Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea 0fa785b4d1 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea 16ba00157b Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 1 year ago
TDE Gitea 7cc243e90c Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea 8eef9bed8d Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea 9aafbd033a Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea 84fa7bec8b Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea 9de164805e Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 1 year ago
TDE Gitea e565ad2fa7 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea a7e212a93a Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea 3e1003aaf6 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea f2898155f9 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea 7c08c0ee9d Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea f932cc9388 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea d90f2bbfbb Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 1 year ago
TDE Gitea 0916cf6006 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 2 years ago
TDE Gitea 7b11018e04 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 2 years ago
Slávek Banko 375d25e8e6
Switch all submodules to https. 2 years ago
TDE Gitea a7c861bcd8 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 2 years ago
TDE Gitea f8ab08f832 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 3 years ago
TDE Gitea db379cc3fa Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 3 years ago
TDE Gitea 2cb0696c34 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 3 years ago
TDE Gitea 4c00657dda Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 3 years ago
TDE Gitea 297ff5a7d5 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 3 years ago
TDE Gitea 98ada16ebc Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 3 years ago
TDE Gitea 254e988cc5 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 3 years ago
TDE Gitea 605c79242f Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 3 years ago
TDE Gitea e4a7f125b4 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 3 years ago
TDE Gitea 1ef895136d Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 3 years ago
TDE Gitea 9e1d462bfe Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 3 years ago
TDE Gitea c8e670a7fd Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 3 years ago
TDE Gitea 0e332430bf Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 3 years ago
TDE Gitea dc33d1b07c Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 3 years ago
Slávek Banko 9ae5c05569 Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 3 years ago
Slávek Banko 247b382cf4 Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 3 years ago
Slávek Banko d7a5f42ab6 Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 3 years ago
Slávek Banko b6a6f10a87 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 5 years ago
Slávek Banko f92ed05d89 Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 5 years ago
Slávek Banko ff7e9701eb Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 6 years ago
Slávek Banko b3194ca2b4 Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 6 years ago
Slávek Banko 3fa51f4e66 Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 8 years ago
Slávek Banko 157940498f Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 9 years ago
Slávek Banko f47e54bcf2 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 9 years ago
Slávek Banko 87024cb896 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 9 years ago
Slávek Banko d513a2036c Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 9 years ago
Slávek Banko a6b3b29ecc Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 9 years ago
Slávek Banko dbf83c5b9d Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 9 years ago
Slávek Banko 3e60d507c0 Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 9 years ago
Slávek Banko 9ac8b758df Reset submodule main/applications/tde-systemsettings/cmake to latest HEAD 9 years ago
Slávek Banko 18f3a7e736 Reset submodule main/applications/tde-systemsettings/admin to latest HEAD 9 years ago
Slávek Banko e55ed7f299 Update final HTML install path so all modules are consistent. 9 years ago
Darrell Anderson 179eb1df19 Update HTML install path references. 10 years ago
Timothy Pearson e177675f1f Fix crash when no modules are available 9 years ago
Timothy Pearson bd140e2d7e Rename obsolete tq methods to standard names 10 years ago
Timothy Pearson 5a057fe5d9 Remove additional unneeded tq method conversions 10 years ago
Timothy Pearson 2cbad6e685 Rename old tq methods that no longer need a unique name 10 years ago
Slávek Banko 19d1af3d8d Add common directories 9 years ago
  1. 3
      .gitmodules
  2. 2
      acinclude.m4
  3. 2
      aclocal.m4
  4. 1
      admin
  5. 2
      systemsettings/kcmsearch.cpp
  6. 4
      systemsettings/kcscrollview.cpp
  7. 2
      systemsettings/kcscrollview.h
  8. 12
      systemsettings/mainwindow.cpp
  9. 14
      systemsettings/modulesview.cpp
  10. 4
      systemsettings/modulesview.h

3
.gitmodules

@ -0,0 +1,3 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

2
acinclude.m4

@ -428,7 +428,7 @@ AC_DEFUN([KDE_SET_DEFAULT_PATHS],
if test "$1" = "default"; then
if test -z "$kde_htmldir"; then
kde_htmldir='\${datadir}/doc/HTML'
kde_htmldir='\${datadir}/doc/tde/HTML'
fi
if test -z "$kde_appsdir"; then
kde_appsdir='\${datadir}/applnk'

2
aclocal.m4

@ -440,7 +440,7 @@ AC_DEFUN([KDE_SET_DEFAULT_PATHS],
if test "$1" = "default"; then
if test -z "$kde_htmldir"; then
kde_htmldir='\${datadir}/doc/HTML'
kde_htmldir='\${datadir}/doc/tde/HTML'
fi
if test -z "$kde_appsdir"; then
kde_appsdir='\${datadir}/applnk'

1
admin

@ -0,0 +1 @@
Subproject commit 5bf424d9d8a3a8c3a894d6540ae164a42d2c25a5

2
systemsettings/kcmsearch.cpp

@ -28,7 +28,7 @@
#include "moduleiconitem.h"
KcmSearch::KcmSearch( TQPtrList<ModulesView> *moduleViewList, TQWidget *parent, const char *name )
: KIconViewSearchLine(parent, moduleViewList->at(0)->groups[0], name){
: KIconViewSearchLine(parent, (moduleViewList->at(0))?moduleViewList->at(0)->groups[0]:NULL, name){
this->moduleViewList = moduleViewList;
}

4
systemsettings/kcscrollview.cpp

@ -25,8 +25,8 @@ KCScrollView::KCScrollView( TQWidget * parent, const char * name, WFlags f) : TQ
mainChild = 0;
}
TQSize KCScrollView::tqsizeHint() const {
TQSize vphint = mainChild->tqsizeHint();
TQSize KCScrollView::sizeHint() const {
TQSize vphint = mainChild->sizeHint();
vphint.setWidth(vphint.width()+2*frameWidth());
vphint.setHeight(vphint.height()+2*frameWidth());
return vphint;

2
systemsettings/kcscrollview.h

@ -26,7 +26,7 @@ class KCScrollView : public TQScrollView {
public:
KCScrollView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
virtual TQSize tqsizeHint() const;
virtual TQSize sizeHint() const;
virtual void addChild(TQWidget *child, int x=0, int y=0);
private:
TQWidget *mainChild;

12
systemsettings/mainwindow.cpp

@ -180,7 +180,9 @@ void MainWindow::buildActions()
kdDebug() << "relpath is :" << group->relPath() << endl;
}
}
pageActions.at(0)->setChecked(true);
if (pageActions.at(0)) {
pageActions.at(0)->setChecked(true);
}
}
void MainWindow::aboutCurrentModule()
@ -289,7 +291,7 @@ void MainWindow::slotItemSelected( TQIconViewItem *item ){
void MainWindow::timerResize() {
TQSize currentSize = size();
TQSize newSize = currentSize.expandedTo(tqsizeHint());
TQSize newSize = currentSize.expandedTo(sizeHint());
// Avoid resizing if possible.
if(newSize!=currentSize) {
resize(newSize);
@ -298,7 +300,7 @@ void MainWindow::timerResize() {
void MainWindow::updateModuleHelp( KCModuleProxy *currentModule ) {
if ( currentModule->aboutData() ) {
aboutModuleAction->setText(i18n("Help menu->about <modulename>", "About %1").tqarg(
aboutModuleAction->setText(i18n("Help menu->about <modulename>", "About %1").arg(
currentModule->moduleInfo().moduleName().replace("&","&&")));
aboutModuleAction->setIcon(currentModule->moduleInfo().icon());
aboutModuleAction->setEnabled(true);
@ -349,11 +351,11 @@ void MainWindow::slotSearchHits(const TQString &query, int *hitList, int length)
} else {
if(length>=1) {
generalHitLabel->setText(i18n("%1 hit in General","%1 hits in General",hitList[0]).tqarg(hitList[0]));
generalHitLabel->setText(i18n("%1 hit in General","%1 hits in General",hitList[0]).arg(hitList[0]));
}
if(length>=2) {
advancedHitLabel->setText(i18n("%1 hit in Advanced","%1 hits in Advanced",hitList[1]).tqarg(hitList[1]));
advancedHitLabel->setText(i18n("%1 hit in Advanced","%1 hits in Advanced",hitList[1]).arg(hitList[1]));
}
}

14
systemsettings/modulesview.cpp

@ -43,7 +43,7 @@ ModulesView::ModulesView( KCModuleMenu *rootMenu, const TQString &menuPath, TQWi
this->rootMenu = rootMenu;
this->menuPath = menuPath;
TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 11, 6, "tqlayout" );
TQVBoxLayout *layout = new TQVBoxLayout( this, 11, 6, "layout" );
displayName = this->rootMenu->caption;
@ -58,13 +58,13 @@ ModulesView::ModulesView( KCModuleMenu *rootMenu, const TQString &menuPath, TQWi
TQFrame *line = new TQFrame( this, "line");
line->setFrameShadow( TQFrame::Sunken );
line->setFrameShape( TQFrame::HLine );
tqlayout->addWidget( line );
layout->addWidget( line );
}
// Build the row of modules/icons
createRow( (*it).subMenu, tqlayout );
createRow( (*it).subMenu, layout );
}
tqlayout->addStretch(1);
layout->addStretch(1);
// Make empty iconView for the search widget
if( groups.count()==0 ) {
@ -112,14 +112,14 @@ void ModulesView::createRow( const TQString &parentPath, TQBoxLayout *boxLayout
// Heaer Icon
TQLabel *icon = new TQLabel( this, "groupicon" );
icon->setPixmap( SmallIcon( group->icon() ) );
icon->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1,
icon->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1,
(TQSizePolicy::SizeType)5, 0, 0, icon->sizePolicy().hasHeightForWidth() ) );
rowLayout->addWidget( icon );
// Header Name
TQLabel *textLabel = new TQLabel( this, "groupcaption" );
textLabel->setText( group->caption() );
textLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
textLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
(TQSizePolicy::SizeType)5, 0, 0, textLabel->sizePolicy().hasHeightForWidth()));
TQFont textLabel_font( textLabel->font() );
textLabel_font.setBold( true );
@ -160,7 +160,7 @@ void ModulesView::createRow( const TQString &parentPath, TQBoxLayout *boxLayout
}
// Force the height for those items that have two words.
iconView->setMinimumHeight( iconView->tqminimumSizeHint().height() );
iconView->setMinimumHeight( iconView->minimumSizeHint().height() );
}
void ModulesView::clearSelection() {

4
systemsettings/modulesview.h

@ -34,7 +34,7 @@ public:
: KIconView( parent, name ){ };
// Figure out the hight/width to have only one row
TQSize tqminimumSizeHint() const {
TQSize minimumSizeHint() const {
int width = 0;
/*
for ( TQIconViewItem *item = firstItem(); item; item = item->nextItem() )
@ -94,7 +94,7 @@ private:
KCModuleMenu *rootMenu;
TQString menuPath;
void createRow( const TQString &parentPath, TQBoxLayout *tqlayout );
void createRow( const TQString &parentPath, TQBoxLayout *layout );
};
#endif // MODULESVIEW_H

Loading…
Cancel
Save