diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-03-15 17:32:48 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-03-15 17:32:48 +0000 |
| commit | e2f541c98dfa4081fa3ab3d28f08ea2309281884 (patch) | |
| tree | cb721a55bc88753ddeb9754dc98ef45e2850ce30 /src/settings | |
| download | tdesvn-e2f541c98dfa4081fa3ab3d28f08ea2309281884.tar.gz tdesvn-e2f541c98dfa4081fa3ab3d28f08ea2309281884.zip | |
Added KDE3 version of kdesvn
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1103685 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/settings')
23 files changed, 2231 insertions, 0 deletions
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt new file mode 100644 index 0000000..fb1cd60 --- /dev/null +++ b/src/settings/CMakeLists.txt @@ -0,0 +1,50 @@ +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + +KDE3_ADD_KCFG_FILES(cfgsrc + kdesvnsettings.kcfgc) +ADD_LIBRARY(kdesvncfgreader STATIC ${cfgsrc}) + +KDE3_ADD_UI_FILES( + settings_ui_sources + dispcolor_settings.ui + display_settings.ui + revisiontree_settings.ui + subversion_settings.ui + cmdexecsettings.ui + diffmergesettings.ui +) + +SET(settings_sources + dispcolorsettings_impl.cpp + displaysettings_impl.cpp + revisiontreesettingsdlg_impl.cpp + subversionsettings_impl.cpp + cmdexecsettings_impl.cpp + diffmergesettings_impl.cpp) + +FILE(GLOB hdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h") + +KDE3_AUTOMOC(${settings_sources}) +ADD_LIBRARY(settingsdlgs STATIC ${settings_ui_sources} ${settings_sources} ${hdr}) +ADD_DEPENDENCIES(settingsdlgs kdesvncfgreader) + +SET_TARGET_PROPERTIES(kdesvncfgreader settingsdlgs + PROPERTIES + COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) + +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/kdesvn_part.kcfg DESTINATION ${KCFG_INSTALL_DIR}) + +INSTALL( + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/kdesvnpartrc-use-external.upd + DESTINATION + ${DATA_INSTALL_DIR}/kconf_update +) + +INSTALL( + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/kdesvn-use-external-update.sh + DESTINATION + ${DATA_INSTALL_DIR}/kconf_update + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ +) diff --git a/src/settings/cmdexecsettings.ui b/src/settings/cmdexecsettings.ui new file mode 100644 index 0000000..e2b4a4e --- /dev/null +++ b/src/settings/cmdexecsettings.ui @@ -0,0 +1,155 @@ +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +<class>CmdExecSettings</class> +<widget class="QWidget"> + <property name="name"> + <cstring>CmdExecSettings</cstring> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>323</width> + <height>163</height> + </rect> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_cmdline_show_logwindow</cstring> + </property> + <property name="text"> + <string>Show log after executing a command</string> + </property> + <property name="toolTip" stdset="0"> + <string>Show a small window containing the log after command executed</string> + </property> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout2</cstring> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>textLabel1</cstring> + </property> + <property name="text"> + <string>Minimum log lines to show:</string> + </property> + </widget> + <widget class="KIntNumInput" row="0" column="1"> + <property name="name"> + <cstring>kcfg_cmdline_log_minline</cstring> + </property> + <property name="minValue"> + <number>0</number> + </property> + <property name="suffix"> + <string> line(s)</string> + </property> + <property name="specialValueText"> + <string>0</string> + <comment>no limit</comment> + </property> + <property name="toolTip" stdset="0"> + <string>The minimum a log output must contain before kdesvn shows a single logwindow</string> + </property> + </widget> + </grid> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_no_konqueror_contextmenu</cstring> + </property> + <property name="text"> + <string>Don't display contextmenu in Konqueror</string> + </property> + <property name="toolTip" stdset="0"> + <string>If set, kdesvn will not show a menu inside "Action" menu of konqueror</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_kio_use_standard_logmsg</cstring> + </property> + <property name="text"> + <string>KIO operations use standard logmessage</string> + </property> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout2</cstring> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="KLineEdit" row="0" column="1"> + <property name="name"> + <cstring>kcfg_kio_standard_logmsg</cstring> + </property> + </widget> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>stdLogmsgLabel</cstring> + </property> + <property name="text"> + <string>Standard message:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + </grid> + </widget> + <spacer> + <property name="name"> + <cstring>spacer1</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>16</height> + </size> + </property> + </spacer> + </vbox> +</widget> +<customwidgets> +</customwidgets> +<connections> + <connection> + <sender>kcfg_kio_use_standard_logmsg</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_kio_standard_logmsg</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>kcfg_cmdline_show_logwindow</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_cmdline_log_minline</receiver> + <slot>setEnabled(bool)</slot> + </connection> +</connections> +<slots> + <slot access="protected">showLogToggled(bool)</slot> +</slots> +<layoutdefaults spacing="6" margin="11"/> +<includehints> + <includehint>knuminput.h</includehint> + <includehint>knuminput.h</includehint> + <includehint>klineedit.h</includehint> +</includehints> +</UI> diff --git a/src/settings/cmdexecsettings_impl.cpp b/src/settings/cmdexecsettings_impl.cpp new file mode 100644 index 0000000..94f4f3d --- /dev/null +++ b/src/settings/cmdexecsettings_impl.cpp @@ -0,0 +1,41 @@ +/*************************************************************************** + * Copyright (C) 2005-2007 by Rajko Albrecht * + * ral@alwins-world.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + + +#include "cmdexecsettings_impl.h" + +#include <klocale.h> +#include <knuminput.h> +#include <qcheckbox.h> +#include <klineedit.h> + +CmdExecSettings_impl::CmdExecSettings_impl(QWidget* parent, const char* name, WFlags fl) +: CmdExecSettings(parent,name,fl) +{ + kcfg_cmdline_log_minline->setSpecialValueText(i18n("No minimum")); + kcfg_cmdline_log_minline->setEnabled(kcfg_cmdline_show_logwindow->isChecked()); + kcfg_kio_standard_logmsg->setEnabled(kcfg_kio_use_standard_logmsg->isChecked()); +} + +CmdExecSettings_impl::~CmdExecSettings_impl() +{ +} + +#include "cmdexecsettings_impl.moc" diff --git a/src/settings/cmdexecsettings_impl.h b/src/settings/cmdexecsettings_impl.h new file mode 100644 index 0000000..ab1749b --- /dev/null +++ b/src/settings/cmdexecsettings_impl.h @@ -0,0 +1,46 @@ +/*************************************************************************** + * Copyright (C) 2005-2007 by Rajko Albrecht * + * ral@alwins-world.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#ifndef CMDEXECSETTINGS_IMPL_H +#define CMDEXECSETTINGS_IMPL_H + +#include "src/settings/cmdexecsettings.h" + +class CmdExecSettings_impl : public CmdExecSettings +{ + Q_OBJECT + +public: + CmdExecSettings_impl(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ~CmdExecSettings_impl(); + /*$PUBLIC_FUNCTIONS$*/ + +public slots: + /*$PUBLIC_SLOTS$*/ + +protected: + +protected slots: + /*$PROTECTED_SLOTS$*/ + +}; + +#endif + diff --git a/src/settings/diffmergesettings.ui b/src/settings/diffmergesettings.ui new file mode 100644 index 0000000..07638a0 --- /dev/null +++ b/src/settings/diffmergesettings.ui @@ -0,0 +1,251 @@ +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +<class>DiffMergeSettings</class> +<widget class="QWidget"> + <property name="name"> + <cstring>DiffMergeSettings</cstring> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>260</width> + <height>308</height> + </rect> + </property> + <property name="caption"> + <string>DiffMergeSettings</string> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_diff_ignore_content</cstring> + </property> + <property name="text"> + <string>Diff ignores content type</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_tree_diff_rec</cstring> + </property> + <property name="text"> + <string>Diff in revisiontree is recursive</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_diff_ignore_spaces</cstring> + </property> + <property name="text"> + <string>Diff ignores white space changes</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_diff_ignore_all_white_spaces</cstring> + </property> + <property name="text"> + <string>Diff ignores all white spaces</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_use_external_diff</cstring> + </property> + <property name="text"> + <string>Use external diff display</string> + </property> + <property name="toolTip" stdset="0"> + <string>If kdesvn should use an external diff display and/or generator. If not checked use internal display.</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_extern_merge_default</cstring> + </property> + <property name="text"> + <string>Prefer external merge program</string> + </property> + <property name="toolTip" stdset="0"> + <string>Set if merge with external program is prefered and not subversions merge</string> + </property> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout2</cstring> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>m_extern_hint</cstring> + </property> + <property name="text"> + <string>see "Whats this" for details</string> + </property> + <property name="alignment"> + <set>WordBreak|AlignCenter</set> + </property> + </widget> + <widget class="QLayoutWidget" row="1" column="0"> + <property name="name"> + <cstring>layout2</cstring> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel" row="2" column="0"> + <property name="name"> + <cstring>resolveLabel</cstring> + </property> + <property name="text"> + <string>Conflict resolver program:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="QLabel" row="1" column="0"> + <property name="name"> + <cstring>textLabel1</cstring> + </property> + <property name="text"> + <string>External merge program:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="KLineEdit" row="2" column="1"> + <property name="name"> + <cstring>kcfg_conflict_resolver</cstring> + </property> + <property name="toolTip" stdset="0"> + <string>Setup an external program for conflict resolving</string> + </property> + <property name="whatsThis" stdset="0"> + <string><p> +Enter how kdesvn should call the conflict resolver program. The form is +<p align="center"> +<b><tt>&lt;program&gt; &lt;programoptions&gt;</tt></b> +</p> +<p> +Programoption may contain the place holders for substituting with filenames. +</p> +The substitutions means:<br> +<b><tt>%o</tt></b> Old version<br> +<b><tt>%m</tt></b> Mine or local edit version<br> +<b><tt>%n</tt></b> Newest version<br> +<b><tt>%t</tt></b> The target to save as, kdesvn will use the orignal file name for it. +</p> +<p> +Default: <tt>kdiff3 %o %m %n -o %t</tt> +</p></string> + </property> + </widget> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>mdiff_display_label</cstring> + </property> + <property name="text"> + <string>External diff display:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="KLineEdit" row="1" column="1"> + <property name="name"> + <cstring>kcfg_external_merge_program</cstring> + </property> + <property name="toolTip" stdset="0"> + <string>Setup an external program for merging</string> + </property> + <property name="whatsThis" stdset="0"> + <string><p> +Enter how kdesvn should call the external merge program. The form is +<p align="center"> +<b><tt>&lt;program&gt; &lt;programoptions&gt; %s1 %s2 %t</tt></b> +</p> +The substitutions means:<br> +<b><tt>%s1</tt></b> Source one for merge<br> +<b><tt>%s2</tt></b> Source two for merge, if it was not set equal to source one but other revision<br> +<b><tt>%t</tt></b> Local target for merge. +</p></string> + </property> + </widget> + <widget class="KLineEdit" row="0" column="1"> + <property name="name"> + <cstring>kcfg_external_diff_display</cstring> + </property> + <property name="whatsThis" stdset="0"> + <string><p align="left"> +Enter an external program in form +<p align="center"> +<tt>&lt;program&gt; &lt;param&gt; %f</tt> +</p> +or +<p align="center"> +<tt>&lt;program&gt; &lt;param&gt;</tt> +</p> +or +<p align="center"> +<tt>&lt;program&gt; &lt;param&gt; %1 %2</tt> +</p> +<br> +If using first or second form, svn itself will generate the diff. %f will replaced with a temporary filename. If %f is not given, +the diff-display should able reading data from stdin. +<br> +When %1 and %2 is given, kdesvn let this display make the diff. For that it it makes a temporary export or get (if needed) and fill out the parameters with the right value. %1 will filled with the content of start-revision, %2 with the endrevision. On large recoursive diffs this may get real slow! +</p></string> + </property> + </widget> + </grid> + </widget> + </grid> + </widget> + <spacer> + <property name="name"> + <cstring>spacer3</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>16</height> + </size> + </property> + </spacer> + </vbox> +</widget> +<customwidgets> +</customwidgets> +<connections> + <connection> + <sender>kcfg_use_external_diff</sender> + <signal>toggled(bool)</signal> + <receiver>DiffMergeSettings</receiver> + <slot>diffDispChanged(bool)</slot> + </connection> +</connections> +<slots> + <slot access="protected">diffDispChanged(bool)</slot> +</slots> +<layoutdefaults spacing="6" margin="11"/> +<includehints> + <includehint>klineedit.h</includehint> + <includehint>klineedit.h</includehint> + <includehint>klineedit.h</includehint> +</includehints> +</UI> diff --git a/src/settings/diffmergesettings_impl.cpp b/src/settings/diffmergesettings_impl.cpp new file mode 100644 index 0000000..91ddab3 --- /dev/null +++ b/src/settings/diffmergesettings_impl.cpp @@ -0,0 +1,45 @@ +/*************************************************************************** + * Copyright (C) 2005-2007 by Rajko Albrecht * + * ral@alwins-world.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#include "diffmergesettings_impl.h" +#include "src/settings/kdesvnsettings.h" + +#include <qbuttongroup.h> +#include <qcheckbox.h> +#include <qradiobutton.h> +#include <klineedit.h> +#include <kdebug.h> + +DiffMergeSettings_impl::DiffMergeSettings_impl(QWidget *parent, const char *name) + :DiffMergeSettings(parent, name) +{ + kcfg_external_diff_display->setEnabled(Kdesvnsettings::use_external_diff()); +} + +DiffMergeSettings_impl::~DiffMergeSettings_impl() +{ +} + +void DiffMergeSettings_impl::diffDispChanged(bool how) +{ + kcfg_external_diff_display->setEnabled(how); +} + +#include "diffmergesettings_impl.moc" + diff --git a/src/settings/diffmergesettings_impl.h b/src/settings/diffmergesettings_impl.h new file mode 100644 index 0000000..639e38b --- /dev/null +++ b/src/settings/diffmergesettings_impl.h @@ -0,0 +1,34 @@ +/*************************************************************************** + * Copyright (C) 2005-2007 by Rajko Albrecht * + * ral@alwins-world.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#ifndef DIFFMERGESETTINGS_IMPL_H +#define DIFFMERGESETTINGS_IMPL_H + +#include "src/settings/diffmergesettings.h" + +class DiffMergeSettings_impl: public DiffMergeSettings { +Q_OBJECT +public: + DiffMergeSettings_impl(QWidget *parent = 0, const char *name = 0); + virtual ~DiffMergeSettings_impl(); +protected slots: + virtual void diffDispChanged(bool); +}; + +#endif diff --git a/src/settings/dispcolor_settings.ui b/src/settings/dispcolor_settings.ui new file mode 100644 index 0000000..c5118ba --- /dev/null +++ b/src/settings/dispcolor_settings.ui @@ -0,0 +1,259 @@ +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +<class>DispColorSettings</class> +<widget class="QWidget"> + <property name="name"> + <cstring>ColorSettings</cstring> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>264</width> + <height>325</height> + </rect> + </property> + <property name="caption"> + <string>ColorSettings</string> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_colored_state</cstring> + </property> + <property name="text"> + <string>Mark changed and locked items colored</string> + </property> + <property name="accel"> + <string></string> + </property> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout2</cstring> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="KColorButton" row="8" column="1"> + <property name="name"> + <cstring>kcfg_color_conflicted_item</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + <widget class="KColorButton" row="0" column="1"> + <property name="name"> + <cstring>kcfg_color_changed_item</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + <widget class="KColorButton" row="2" column="1"> + <property name="name"> + <cstring>kcfg_color_item_added</cstring> + </property> + <property name="text"> + <string></string> + </property> + <property name="accel"> + <string></string> + </property> + </widget> + <widget class="QLabel" row="4" column="0"> + <property name="name"> + <cstring>textLabel5</cstring> + </property> + <property name="text"> + <string>Locked items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="KColorButton" row="3" column="1"> + <property name="name"> + <cstring>kcfg_color_item_deleted</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + <widget class="QLabel" row="7" column="0"> + <property name="name"> + <cstring>textLabel2_2</cstring> + </property> + <property name="text"> + <string>Not versioned items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="QLabel" row="1" column="0"> + <property name="name"> + <cstring>textLabel3</cstring> + </property> + <property name="text"> + <string>Remote changed items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="QLabel" row="2" column="0"> + <property name="name"> + <cstring>textLabel1</cstring> + </property> + <property name="text"> + <string>Added items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="QLabel" row="3" column="0"> + <property name="name"> + <cstring>textLabel4</cstring> + </property> + <property name="text"> + <string>Deleted items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="KColorButton" row="5" column="1"> + <property name="name"> + <cstring>kcfg_color_need_lock</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + <widget class="KColorButton" row="6" column="1"> + <property name="name"> + <cstring>kcfg_color_missed_item</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + <widget class="KColorButton" row="4" column="1"> + <property name="name"> + <cstring>kcfg_color_locked_item</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + <widget class="KColorButton" row="7" column="1"> + <property name="name"> + <cstring>kcfg_color_notversioned_item</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + <widget class="QLabel" row="8" column="0"> + <property name="name"> + <cstring>Conflicted_items_label</cstring> + </property> + <property name="text"> + <string>Conflicted items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="QLabel" row="6" column="0"> + <property name="name"> + <cstring>Missed_items_label</cstring> + </property> + <property name="text"> + <string>Missed items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>textLabel2</cstring> + </property> + <property name="text"> + <string>Local changed items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="QLabel" row="5" column="0"> + <property name="name"> + <cstring>Need_lock_label_2</cstring> + </property> + <property name="text"> + <string>Item needs lock:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="KColorButton" row="1" column="1"> + <property name="name"> + <cstring>kcfg_color_need_update</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + </grid> + </widget> + <spacer> + <property name="name"> + <cstring>spacer1</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </vbox> +</widget> +<connections> + <connection> + <sender>kcfg_colored_state</sender> + <signal>toggled(bool)</signal> + <receiver>ColorSettings</receiver> + <slot>coloredStateToggled(bool)</slot> + </connection> +</connections> +<slots> + <slot access="protected">coloredStateToggled(bool)</slot> +</slots> +<layoutdefaults spacing="6" margin="11"/> +<includehints> + <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> +</includehints> +</UI> diff --git a/src/settings/dispcolorsettings_impl.cpp b/src/settings/dispcolorsettings_impl.cpp new file mode 100644 index 0000000..1b3ad0c --- /dev/null +++ b/src/settings/dispcolorsettings_impl.cpp @@ -0,0 +1,47 @@ +/*************************************************************************** + * Copyright (C) 2005-2007 by Rajko Albrecht * + * ral@alwins-world.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#include "dispcolorsettings_impl.h" +#include <kcolorbutton.h> +#include <qcheckbox.h> + +DispColorSettings_impl::DispColorSettings_impl(QWidget *parent, const char *name) + :DispColorSettings(parent, name) +{ + coloredStateToggled(kcfg_colored_state->isChecked()); +} + +DispColorSettings_impl::~DispColorSettings_impl() +{ +} + +void DispColorSettings_impl::coloredStateToggled(bool how) +{ + kcfg_color_locked_item->setEnabled(how); + kcfg_color_changed_item->setEnabled(how); + kcfg_color_item_deleted->setEnabled(how); + kcfg_color_item_added->setEnabled(how); + kcfg_color_need_update->setEnabled(how); + kcfg_color_missed_item->setEnabled(how); + kcfg_color_notversioned_item->setEnabled(how); + kcfg_color_conflicted_item->setEnabled(how); +} + + +#include "dispcolorsettings_impl.moc" diff --git a/src/settings/dispcolorsettings_impl.h b/src/settings/dispcolorsettings_impl.h new file mode 100644 index 0000000..56e0edd --- /dev/null +++ b/src/settings/dispcolorsettings_impl.h @@ -0,0 +1,34 @@ +/*************************************************************************** + * Copyright (C) 2005-2007 by Rajko Albrecht * + * ral@alwins-world.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#ifndef DISPCOLORSETTINGS_IMPL_H +#define DISPCOLORSETTINGS_IMPL_H + +#include "src/settings/dispcolor_settings.h" + +class DispColorSettings_impl: public DispColorSettings { +Q_OBJECT +public: + DispColorSettings_impl(QWidget *parent = 0, const char *name = 0); + virtual ~DispColorSettings_impl(); +protected slots: + virtual void coloredStateToggled(bool); +}; + +#endif diff --git a/src/settings/display_settings.ui b/src/settings/display_settings.ui new file mode 100644 index 0000000..f3dfe98 --- /dev/null +++ b/src/settings/display_settings.ui @@ -0,0 +1,243 @@ +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +<class>DisplaySettings</class> +<widget class="QWidget"> + <property name="name"> + <cstring>DisplaySettings</cstring> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>280</width> + <height>295</height> + </rect> + </property> + <property name="caption"> + <string>Settings</string> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout1</cstring> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>m_ListIconsSize_label</cstring> + </property> + <property name="text"> + <string>Size of Listviewicons</string> + </property> + </widget> + <widget class="KIntSpinBox" row="0" column="1"> + <property name="name"> + <cstring>kcfg_listview_icon_size</cstring> + </property> + <property name="maxValue"> + <number>128</number> + </property> + <property name="minValue"> + <number>16</number> + </property> + <property name="value"> + <number>22</number> + </property> + </widget> + </grid> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_display_file_tips</cstring> + </property> + <property name="text"> + <string>Show file info</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Here you can control if, when moving the mouse over a file, you want to see a small popup window with additional information about that file</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_display_previews_in_file_tips</cstring> + </property> + <property name="text"> + <string>Display previews in file tips</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Here you can control if you want the popup window to contain a larger preview for the file, when moving the mouse over it</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_display_overlays</cstring> + </property> + <property name="text"> + <string>Mark item status with icon overlay</string> + </property> + <property name="toolTip" stdset="0"> + <string>Mark subversion states with an overlayed icon</string> + </property> + <property name="whatsThis" stdset="0"> + <string><p align="left"> +Mark an items with non-normal state with an overlayed icon. When you wish to +see which items has newer items in repository you may have to set "Check for updates on open" in Subversion-Dialog. +</p></string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_case_sensitive_sort</cstring> + </property> + <property name="text"> + <string>Items sortorder is case sensitive</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_display_ignored_files</cstring> + </property> + <property name="text"> + <string>Display ignored files</string> + </property> + <property name="accel"> + <string></string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_start_log_cache_on_open</cstring> + </property> + <property name="text"> + <string>Automatic update of logcache</string> + </property> + <property name="toolTip" stdset="0"> + <string>If set start filling the logcache when open a repository or working copy</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Set if the internal logcache should updated after open a working copy or repository or after a commit in a working copy. + +If networking is disabled, then this flag is ignored.</string> + </property> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout2_2</cstring> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>m_display_label</cstring> + </property> + <property name="text"> + <string>External display:</string> + </property> + </widget> + <widget class="KLineEdit" row="0" column="1"> + <property name="name"> + <cstring>kcfg_external_display</cstring> + </property> + <property name="whatsThis" stdset="0"> + <string><p align="left"> +Enter an external program for opening file on doubleclick in form +<br> +<tt>&lt;program&gt;</tt> +</p> +<p> +When kde-default is wanted for opening on double click, enter &quot;default&quot; and kde selects action. +</p></string> + </property> + </widget> + </grid> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout3</cstring> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel" row="0" column="0"> + <property name="name"> + <cstring>m_MaxLogLabel</cstring> + </property> + <property name="text"> + <string>Maximum logmessages in history:</string> + </property> + </widget> + <widget class="KIntSpinBox" row="0" column="1"> + <property name="name"> + <cstring>kcfg_max_log_messages</cstring> + </property> + <property name="maxValue"> + <number>150</number> + </property> + <property name="minValue"> + <number>0</number> + </property> + </widget> + </grid> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_colored_blame</cstring> + </property> + <property name="text"> + <string>Display colored annotate</string> + </property> + </widget> + <spacer> + <property name="name"> + <cstring>spacer4</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>16</height> + </size> + </property> + </spacer> + </vbox> +</widget> +<customwidgets> +</customwidgets> +<connections> + <connection> + <sender>kcfg_display_file_tips</sender> + <signal>toggled(bool)</signal> + <receiver>DisplaySettings</receiver> + <slot>dispFileInfotoggled(bool)</slot> + </connection> + <connection> + <sender>kcfg_external_display</sender> + <signal>selectionChanged()</signal> + <receiver>DisplaySettings</receiver> + <slot>diffDispChanged()</slot> + </connection> +</connections> +<slots> + <slot access="protected">diffDispChanged()</slot> + <slot access="protected">dispFileInfotoggled(bool)</slot> +</slots> +<layoutdefaults spacing="6" margin="11"/> +<includehints> + <includehint>knuminput.h</includehint> + <includehint>klineedit.h</includehint> + <includehint>knuminput.h</includehint> +</includehints> +</UI> diff --git a/src/settings/displaysettings_impl.cpp b/src/settings/displaysettings_impl.cpp new file mode 100644 index 0000000..3f4e79c --- /dev/null +++ b/src/settings/displaysettings_impl.cpp @@ -0,0 +1,44 @@ +/*************************************************************************** + * Copyright (C) 2005-2007 by Rajko Albrecht * + * ral@alwins-world.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#include "displaysettings_impl.h" +#include "src/settings/kdesvnsettings.h" + +#include <qbuttongroup.h> +#include <qcheckbox.h> +#include <qradiobutton.h> +#include <klineedit.h> +#include <kdebug.h> + +DisplaySettings_impl::DisplaySettings_impl(QWidget *parent, const char *name) + :DisplaySettings(parent, name) +{ + kcfg_display_previews_in_file_tips->setEnabled(kcfg_display_file_tips->isChecked()); +} + +DisplaySettings_impl::~DisplaySettings_impl() +{ +} + +void DisplaySettings_impl::dispFileInfotoggled(bool how) +{ + kcfg_display_previews_in_file_tips->setEnabled(how); +} + +#include "displaysettings_impl.moc" diff --git a/src/settings/displaysettings_impl.h b/src/settings/displaysettings_impl.h new file mode 100644 index 0000000..944333e --- /dev/null +++ b/src/settings/displaysettings_impl.h @@ -0,0 +1,34 @@ +/*************************************************************************** + * Copyright (C) 2005-2007 by Rajko Albrecht * + * ral@alwins-world.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#ifndef DISPLAYSETTINGS_IMPL_H +#define DISPLAYSETTINGS_IMPL_H + +#include "src/settings/display_settings.h" + +class DisplaySettings_impl: public DisplaySettings { +Q_OBJECT +public: + DisplaySettings_impl(QWidget *parent = 0, const char *name = 0); + virtual ~DisplaySettings_impl(); +protected slots: + virtual void dispFileInfotoggled(bool); +}; + +#endif diff --git a/src/settings/kdesvn-use-external-update.sh b/src/settings/kdesvn-use-external-update.sh new file mode 100755 index 0000000..c97242a --- /dev/null +++ b/src/settings/kdesvn-use-external-update.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +display= +lastvalue= + +while read line ; do + if [ "${line#\[}" != "$line" ]; then + continue; + fi + KEY="${line%%=*}" + VALUE="${line#*=}" + if echo "$KEY" | grep 'use_kompare_for_diff' >/dev/null 2>/dev/null; then + display=$VALUE + echo '# DELETE [general_items]use_kompare_for_diff' + elif echo "$KEY" | grep 'external_diff_display' > /dev/null 2>/dev/null; then + exdisplay=$VALUE + elif [ "x$KEY" != "x" ]; then + echo "$KEY=$VALUE" + fi +done + +if [ "x$exdisplay" = "x" -o "x$display" = "x1" ]; then + exdisplay="kompare -on -" +fi +if [ "x$display" = "x2" -o "x$display" = "x1" ]; then + display=true +else + display=false +fi +echo "use_external_diff=$display" +echo "external_diff_display=$exdisplay" diff --git a/src/settings/kdesvn_part.kcfg b/src/settings/kdesvn_part.kcfg new file mode 100644 index 0000000..382ddde --- /dev/null +++ b/src/settings/kdesvn_part.kcfg @@ -0,0 +1,261 @@ +<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd"> +<kcfg> + <kcfgfile name="kdesvnpartrc" /> + <include>qstring.h</include> + <group name="general_items" > + <entry key="case_sensitive_sort" type="Bool" > + <label>Set if items sortorder should be case sensitive or not</label> + <default>true</default> + </entry> + <entry key="listview_icon_size" type="Int" > + <label>Size of the icons</label> + <default>22</default> + </entry> + <entry key="display_file_tips" type="Bool" > + <label>Show file informations in tooltip</label> + <default>true</default> + </entry> + <entry key="display_previews_in_file_tips" type="Bool" > + <label>Show preview of the file in tooltip</label> + <default>false</default> + </entry> + <entry key="use_external_diff" type="Bool" > + <label>Use an external program for diff viewing/generating</label> + <default>false</default> + </entry> + <entry key="external_diff_display" type="String" > + <label>Use external program for diff viewing</label> + <default>kompare -on -</default> + </entry> + <entry key="external_display" type="String" > + <label>Use external program for viewing</label> + <default>default</default> + </entry> + <entry key="diff_ignore_content" type="Bool" > + <label>Diff ignores content type</label> + <default>false</default> + </entry> + <entry key="diff_ignore_spaces" type="Bool" > + <label>Diff ignores white space changes</label> + <default>false</default> + </entry> + <entry key="diff_ignore_all_white_spaces" type="Bool" > + <label>Diff ignores all white space</label> + <default>false</default> + </entry> + <entry key="max_log_messages" type="Int" > + <label>Maximum number of log messages</label> + <default>20</default> + </entry> + <entry key="colored_blame" type="Bool" > + <label>Display colored blame lines</label> + <default>true</default> + </entry> + <entry key="commit_splitter_height" type="IntList" > + <default>0,0</default> + </entry> + <entry key="commit_hide_new" type="Bool" > + <default>false</default> + </entry> + </group> + <group name="subversion" > + <entry key="display_overlays" type="Bool" > + <label>Display icon overlays</label> + <default>true</default> + </entry> + <entry key="info_recursive" type="Bool" > + <label>Get item informations recursively</label> + <default>false</default> + </entry> + <entry key="review_commit" type="Bool" > + <label>Review items before commit</label> + <default>true</default> + </entry> + <entry key="display_ignored_files" type="Bool" > + <label>Display ignored files</label> + <default>true</default> + </entry> + <entry key="display_unknown_files" type="Bool"> + <label>Display unknown files</label> + <default>true</default> + </entry> + <entry key="hide_unchanged_files" type="Bool"> + <label>Hide versioned unchanged files</label> + <default>false</default> + </entry> + <entry key="log_follows_nodes" type="Bool" > + <label>Log follows node changes</label> + <default>true</default> + </entry> + <entry key="log_always_list_changed_files" type="Bool" > + <label>Logs always reads list of changed files</label> + <default>true</default> + </entry> + <entry key="start_updates_check_on_open" type="Bool" > + <label>Start check for updates when open working copy</label> + <default>true</default> + </entry> + <entry key="log_cache_on_open" type="Bool"> + <label>Start caching latest logs on open or commit</label> + <default>true</default> + </entry> + <entry key="maximum_displayed_logs" type="UInt" > + <label>Maximum displayed logs when full log (0 for no limit)</label> + <default>0</default> + </entry> + <entry key="details_on_remote_listing" type="Bool" > + <label>Get detailed infos when making a remote listing</label> + <default>false</default> + </entry> + <entry key="properties_on_remote_items" type="Bool"> + <label>Get properties on selected item on networked protocols</label> + <default>false</default> + </entry> + <entry key="remote_special_properties" type="Bool"> + <label>Use properties like bugtraq:url on repository listings</label> + <default>true</default> + </entry> + <entry key="check_needslock" type="Bool"> + <label>Check for propertie svn:needs-lock on listings</label> + <default>false</default> + </entry> + <entry key="store_passwords" type="Bool" > + <label>Store passwords for remote connections</label> + <default>false</default> + </entry> + <entry key="passwords_in_wallet" type="Bool"> + <label>Store passwords in KDE Wallet instead subversion storage</label> + <default>true</default> + </entry> + <entry key="use_password_cache" type="Bool"> + <label>Use internal password cache</label> + <default>true</default> + </entry> + <entry key="network_on" type="Bool"> + <label>Is networking enabled</label> + <default>true</default> + </entry> + </group> + <group name="diffmerge_items"> + <entry key="external_merge_program" type="String" > + <label>Which program to use for external merges</label> + <default>kdiff3 %s1 %s2 %t</default> + </entry> + <entry key="conflict_resolver" type="String"> + <label>Wich program for resolving conflicts</label> + <default>kdiff3 %o %m %n -o %t</default> + </entry> + <entry name="extern_merge_default" type="Bool"> + <label>Prefer external merge program</label> + <default>false</default> + </entry> + </group> + <group name="display" > + <entry key="colored_state" type="Bool" > + <label>Display different then normal states colored</label> + <default>true</default> + </entry> + <entry key="color_need_update" type="Color" > + <default>101,224,76</default> + </entry> + <entry key="color_missed_item" type="Color" > + <default>#CC0000</default> + </entry> + <entry key="color_notversioned_item" type="Color" > + <default>#BBBBBB</default> + </entry> + <entry key="color_locked_item" type="Color" > + <default>#c50003</default> + </entry> + <entry key="color_need_lock" type="Color" > + <default>#ff8888</default> + </entry> + <entry key="color_item_deleted" type="Color" > + <default>#a3a3a3</default> + </entry> + <entry key="color_item_added" type="Color" > + <default>#85bae0</default> + </entry> + <entry key="color_changed_item" type="Color" > + <default>#de5e5e</default> + </entry> + <entry key="color_conflicted_item" type="Color" > + <default>255,0,0</default> + </entry> + </group> + <group name="blame_dlg"> + <entry key="locale_for_blame" type="String" > + <label>Locale for blame display</label> + <default></default> + </entry> + </group> + <group name="diff_display"> + <entry key="locale_for_diff" type="String" > + <default></default> + </entry> + </group> + <group name="revision_tree" > + <entry key="tree_direction" type="Int" > + <default>0</default> + <label>Direction of revision tree</label> + </entry> + <entry key="tree_add_color" type="Color" > + <default>#00FF00</default> + <label>Color for added items</label> + </entry> + <entry key="tree_delete_color" type="Color" > + <default>#FF0000</default> + <label>Color for deleted items</label> + </entry> + <entry key="tree_copy_color" type="Color" > + <default>#C0C0C0</default> + <label>Color for copied items</label> + </entry> + <entry key="tree_rename_color" type="Color" > + <default>#C0C0C0</default> + <label>Color for renamed items</label> + </entry> + <entry key="tree_modify_color" type="Color" > + <default>#a0a0a4</default> + <label>Color for modified items</label> + </entry> + <entry key="tree_detail_height" type="IntList" > + <default>0,0</default> + <label>Height of detail view in tree widget</label> + </entry> + <entry key="tree_diff_rec" type="Bool"> + <default>false</default> + <label>Diffs from Revisiontree are recursive</label> + </entry> + </group> + <group name="cmdline" > + <entry key="no_konqueror_contextmenu" type="Bool" > + <default>false</default> + <label>Should konqueror not display context menus for kdesvn?</label> + </entry> + <entry key="cmdline_show_logwindow" type="Bool" > + <default>true</default> + <label>Show a small logwindow after executing a command.</label> + </entry> + <entry key="cmdline_log_minline" type="UInt" > + <default>0</default> + <label>Log must contain at least lines to show</label> + </entry> + <entry key="kio_use_standard_logmsg" type="Bool" > + <default>false</default> + <label>KIO::svn operations uses a standard logmessage</label> + </entry> + <entry key="kio_standard_logmsg" type="String"> + <default>Revision made with kdesvn KIO.</default> + <label>The standard logmessage to use with KIO if not asking for it.</label> + </entry> + </group> + <group name="internals" > + <entry key="locale_is_casesensitive" type="Bool" > + <whatsthis>This value computes how casesensitive string ordering will made. +Never overwrite the default computed value unless you know what you're doing.</whatsthis> + <default code="true" >QString("a").localeAwareCompare("B")>0</default> + <label>Check if current locale is case sensitive or not</label> + </entry> + </group> +</kcfg> diff --git a/src/settings/kdesvnpartrc-use-external.upd b/src/settings/kdesvnpartrc-use-external.upd new file mode 100644 index 0000000..63a76c6 --- /dev/null +++ b/src/settings/kdesvnpartrc-use-external.upd @@ -0,0 +1,6 @@ +# kdesvnpartrc update +Id=0.14.0-1 +File=kdesvnpartrc +Group=general_items +Options=overwrite +Script=kdesvn-use-external-update.sh,sh diff --git a/src/settings/kdesvnsettings.kcfgc b/src/settings/kdesvnsettings.kcfgc new file mode 100644 index 0000000..db0aa07 --- /dev/null +++ b/src/settings/kdesvnsettings.kcfgc @@ -0,0 +1,6 @@ +# Code generation options for kconfig_compiler +File=kdesvn_part.kcfg +ClassName=Kdesvnsettings +Singleton=true +Mutators=true +# will create the necessary code for setting those variables diff --git a/src/settings/revisiontree_settings.ui b/src/settings/revisiontree_settings.ui new file mode 100644 index 0000000..2d9133e --- /dev/null +++ b/src/settings/revisiontree_settings.ui @@ -0,0 +1,247 @@ +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +<class>RevisiontreeSettingsDlg</class> +<widget class="QWidget"> + <property name="name"> + <cstring>RevisionTreeSettings</cstring> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>246</width> + <height>319</height> + </rect> + </property> + <property name="caption"> + <string>Revisiontree Settings</string> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QButtonGroup"> + <property name="name"> + <cstring>kcfg_tree_direction</cstring> + </property> + <property name="title"> + <string>Direction of revision tree</string> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QRadioButton"> + <property name="name"> + <cstring>m_LeftRight</cstring> + </property> + <property name="text"> + <string>Left to right</string> + </property> + </widget> + <widget class="QRadioButton"> + <property name="name"> + <cstring>m_BottomTop</cstring> + </property> + <property name="text"> + <string>Bottom to top</string> + </property> + </widget> + <widget class="QRadioButton"> + <property name="name"> + <cstring>m_RightLeft</cstring> + </property> + <property name="text"> + <string>Right to left</string> + </property> + </widget> + <widget class="QRadioButton"> + <property name="name"> + <cstring>m_Topbottom</cstring> + </property> + <property name="text"> + <string>Top to bottom</string> + </property> + </widget> + </vbox> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout4</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel"> + <property name="name"> + <cstring>m_AddColorLabel</cstring> + </property> + <property name="text"> + <string>Color for added items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="KColorButton"> + <property name="name"> + <cstring>kcfg_tree_add_color</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + </hbox> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout3</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel"> + <property name="name"> + <cstring>textLabel2</cstring> + </property> + <property name="text"> + <string>Color for deleted items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="KColorButton"> + <property name="name"> + <cstring>kcfg_tree_delete_color</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + </hbox> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout2</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel"> + <property name="name"> + <cstring>textLabel3</cstring> + </property> + <property name="text"> + <string>Color for copied items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="KColorButton"> + <property name="name"> + <cstring>kcfg_tree_copy_color</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + </hbox> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout5</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel"> + <property name="name"> + <cstring>textLabel4</cstring> + </property> + <property name="text"> + <string>Color for renamed items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="KColorButton"> + <property name="name"> + <cstring>kcfg_tree_rename_color</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + </hbox> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout6</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel"> + <property name="name"> + <cstring>textLabel5</cstring> + </property> + <property name="text"> + <string>Color for modified items:</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + </widget> + <widget class="KColorButton"> + <property name="name"> + <cstring>kcfg_tree_modify_color</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + </hbox> + </widget> + <spacer> + <property name="name"> + <cstring>spacer1</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </vbox> +</widget> +<customwidgets> +</customwidgets> +<tabstops> + <tabstop>m_LeftRight</tabstop> + <tabstop>m_RightLeft</tabstop> + <tabstop>m_Topbottom</tabstop> + <tabstop>m_BottomTop</tabstop> +</tabstops> +<layoutdefaults spacing="6" margin="11"/> +<includehints> + <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> +</includehints> +</UI> diff --git a/src/settings/revisiontreesettingsdlg_impl.cpp b/src/settings/revisiontreesettingsdlg_impl.cpp new file mode 100644 index 0000000..0cad80f --- /dev/null +++ b/src/settings/revisiontreesettingsdlg_impl.cpp @@ -0,0 +1,31 @@ +/*************************************************************************** + * Copyright (C) 2006-2007 by Rajko Albrecht * + * ral@alwins-world.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#include "src/settings/revisiontreesettingsdlg_impl.h" + +RevisiontreeSettingsDlg_impl::RevisiontreeSettingsDlg_impl(QWidget *parent, const char *name) + :RevisiontreeSettingsDlg(parent, name) +{ +} + +RevisiontreeSettingsDlg_impl::~RevisiontreeSettingsDlg_impl() +{ +} + +#include "revisiontreesettingsdlg_impl.moc" diff --git a/src/settings/revisiontreesettingsdlg_impl.h b/src/settings/revisiontreesettingsdlg_impl.h new file mode 100644 index 0000000..cc17b72 --- /dev/null +++ b/src/settings/revisiontreesettingsdlg_impl.h @@ -0,0 +1,33 @@ +/*************************************************************************** + * Copyright (C) 2006-2007 by Rajko Albrecht * + * ral@alwins-world.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#ifndef REVISIONTREESETTINGSDLG_IMPL_H +#define REVISIONTREESETTINGSDLG_IMPL_H + +#include "src/settings/revisiontree_settings.h" + +class RevisiontreeSettingsDlg_impl: public RevisiontreeSettingsDlg +{ + Q_OBJECT +public: + RevisiontreeSettingsDlg_impl(QWidget *parent = 0, const char *name = 0); + virtual ~RevisiontreeSettingsDlg_impl(); +}; + +#endif diff --git a/src/settings/subversion_settings.ui b/src/settings/subversion_settings.ui new file mode 100644 index 0000000..9d86625 --- /dev/null +++ b/src/settings/subversion_settings.ui @@ -0,0 +1,249 @@ +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +<class>SubversionSettings</class> +<widget class="QWidget"> + <property name="name"> + <cstring>SubversionSettings</cstring> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>339</width> + <height>410</height> + </rect> + </property> + <property name="caption"> + <string>Subversion Settings</string> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_start_updates_check_on_open</cstring> + </property> + <property name="text"> + <string>Start check for updates when open a working copy</string> + </property> + <property name="accel"> + <string></string> + </property> + <property name="toolTip" stdset="0"> + <string>Select if kdesvn should check for updates when open a working copy</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_log_cache_on_open</cstring> + </property> + <property name="text"> + <string>Start fill log cache on open</string> + </property> + <property name="toolTip" stdset="0"> + <string>Start refresh the logcache for repository when networking enabled</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_check_needslock</cstring> + </property> + <property name="text"> + <string>Check if items has "svn:needs-lock" property set</string> + </property> + <property name="toolTip" stdset="0"> + <string>When listing on working copies kdesvn may check for this property</string> + </property> + <property name="whatsThis" stdset="0"> + <string>When listing on working copies kdesvn may check for <tt>svn:needs-lock</tt> property.<br>But due this listings/updating on folders containing lot of items may get slow. So you should only switch on if you have repositories containing lot of such entries.</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_details_on_remote_listing</cstring> + </property> + <property name="text"> + <string>Get file details while remote listing</string> + </property> + <property name="accel"> + <string></string> + </property> + <property name="toolTip" stdset="0"> + <string>Whether getting details about items when making listing on repositories or not</string> + </property> + <property name="whatsThis" stdset="0"> + <string><p align="left">When checked, kdesvn get more detailed info about file items when making a listing to remote repositories. So you may see remote locks in overview. +</p> +<p align="left"><i>Be careful: This may let listings REAL slow!</i></p></string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_info_recursive</cstring> + </property> + <property name="text"> + <string>Gain item info recursive</string> + </property> + <property name="accel"> + <string></string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_properties_on_remote_items</cstring> + </property> + <property name="text"> + <string>Always get properties on networked repositories</string> + </property> + <property name="accel"> + <string></string> + </property> + <property name="toolTip" stdset="0"> + <string>Should kdesvn retrieves properties on selected item in repositories</string> + </property> + <property name="whatsThis" stdset="0"> + <string>When browsing kdesvn may try displaying properties below itemlist from a selected item. +On networked repositories (eg., not opened via file:// protocol) this may get real slow. So if you have slow network connections or when browsing hangs often you should deactivate it.</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_store_passwords</cstring> + </property> + <property name="text"> + <string>Store passwords for remote connections</string> + </property> + <property name="accel"> + <string></string> + </property> + <property name="toolTip" stdset="0"> + <string>Should subversion store passwords in default</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Storing passwords is often a security problem. Kdesvn itself doesn't store any passwords, but the subversion itself inside the configuration area of subversion. If this area is readable from others you should not set it, but you may select for single non critical accounts inside the authentication dialog.</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_passwords_in_wallet</cstring> + </property> + <property name="text"> + <string>Store passwords into KDE Wallet</string> + </property> + <property name="accel"> + <string></string> + </property> + <property name="toolTip" stdset="0"> + <string>When saving passwords, do it into KDE wallet instead of subversions storage?</string> + </property> + <property name="whatsThis" stdset="0"> + <string><p>Tells if your passwords set in kdesvn should stored into kde wallet instead of simple cleartext storage of subversion.</p> +<p>This would be a little bit more secure 'cause KDE wallet is (mostly) encrypted with a password. On other hand you must re-enter your passwords with other subversion clients not accessing KDE wallet (eg. svn commandline itself, rapidsvn and so on).</p> +<p>If you're HOME storage eg. subversions configfolder is on a network drive you should hard think about not storing passwords in a plain text file like subversion does but put it into an encrypted storage like kde wallet or don't save passwords.</p></string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_use_password_cache</cstring> + </property> + <property name="text"> + <string>Use internal password cache</string> + </property> + <property name="toolTip" stdset="0"> + <string>Use an internal password cache</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_log_follows_nodes</cstring> + </property> + <property name="text"> + <string>Log follows node changes</string> + </property> + <property name="accel"> + <string></string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_log_always_list_changed_files</cstring> + </property> + <property name="text"> + <string>Logs always reads list of changed files</string> + </property> + <property name="accel"> + <string></string> + </property> + <property name="toolTip" stdset="0"> + <string>Read detailed change lists</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Reading lists of changed files may sometimes a little bit slow down things. But if this feature is switched off, kdesvn may fail generating differences between nodechanges from within the logviewer.</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_review_commit</cstring> + </property> + <property name="text"> + <string>Review items before commit</string> + </property> + <property name="accel"> + <string></string> + </property> + <property name="toolTip" stdset="0"> + <string>List items next commit will send or not</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_commit_hide_new</cstring> + </property> + <property name="text"> + <string>Hide new items in commit box</string> + </property> + <property name="accel"> + <string></string> + </property> + <property name="toolTip" stdset="0"> + <string>Should unversioned items displayed in commit dialog or not.</string> + </property> + </widget> + <widget class="KIntNumInput"> + <property name="name"> + <cstring>kcfg_maximum_displayed_logs</cstring> + </property> + <property name="label"> + <string>Maximum displayed logs when full log (0 for no limit)</string> + </property> + <property name="minValue"> + <number>0</number> + </property> + </widget> + <spacer> + <property name="name"> + <cstring>spacer7</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>16</height> + </size> + </property> + </spacer> + </vbox> +</widget> +<customwidgets> +</customwidgets> +<layoutdefaults spacing="6" margin="11"/> +<includehints> + <includehint>knuminput.h</includehint> + <includehint>knuminput.h</includehint> +</includehints> +</UI> diff --git a/src/settings/subversionsettings_impl.cpp b/src/settings/subversionsettings_impl.cpp new file mode 100644 index 0000000..aa0e96a --- /dev/null +++ b/src/settings/subversionsettings_impl.cpp @@ -0,0 +1,37 @@ +/*************************************************************************** + * Copyright (C) 2005-2007 by Rajko Albrecht * + * ral@alwins-world.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + + +#include "subversionsettings_impl.h" + +SubversionSettings_impl::SubversionSettings_impl(QWidget* parent, const char* name, WFlags fl) +: SubversionSettings(parent,name,fl) +{ +} + +SubversionSettings_impl::~SubversionSettings_impl() +{ +} + +/*$SPECIALIZATION$*/ + + +#include "subversionsettings_impl.moc" + diff --git a/src/settings/subversionsettings_impl.h b/src/settings/subversionsettings_impl.h new file mode 100644 index 0000000..e2c42ec --- /dev/null +++ b/src/settings/subversionsettings_impl.h @@ -0,0 +1,47 @@ +/*************************************************************************** + * Copyright (C) 2005-2007 by Rajko Albrecht * + * ral@alwins-world.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#ifndef SUBVERSIONSETTINGS_IMPL_H +#define SUBVERSIONSETTINGS_IMPL_H + +#include "src/settings/subversion_settings.h" + +class SubversionSettings_impl : public SubversionSettings +{ + Q_OBJECT + +public: + SubversionSettings_impl(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ~SubversionSettings_impl(); + /*$PUBLIC_FUNCTIONS$*/ + +public slots: + /*$PUBLIC_SLOTS$*/ + +protected: + /*$PROTECTED_FUNCTIONS$*/ + +protected slots: + /*$PROTECTED_SLOTS$*/ + +}; + +#endif + |