Menu
▾
▴
[Bacula-commits] [bacula.org] Bacula Community source branch Branch-5.2 updated. 5b406a14eff68a993bf309824819a93e65dba420
|
From: <gi...@ba...> - 2013-02-16 18:25:09
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula Community source".
The branch, Branch-5.2 has been updated
via 5b406a14eff68a993bf309824819a93e65dba420 (commit)
via 1b7782a6d65df0d88abba4699aadf7ff3dcfed23 (commit)
via 45321323459de54c1faadcecb08315f1a034c8ff (commit)
from d5566e66c34f60c6599b589066a24d27f779e259 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5b406a14eff68a993bf309824819a93e65dba420
Author: Kern Sibbald <ke...@si...>
Date: Sat Feb 16 19:19:02 2013 +0100
Fix loading of bat translations. Patch from bug #1890
commit 1b7782a6d65df0d88abba4699aadf7ff3dcfed23
Author: Kern Sibbald <ke...@si...>
Date: Sat Feb 16 19:11:54 2013 +0100
Fix text input in bat. Fixe bug #1965
commit 45321323459de54c1faadcecb08315f1a034c8ff
Author: Kern Sibbald <ke...@si...>
Date: Sat Feb 16 16:22:17 2013 +0100
Remove Device from show command as it is not used or updated
-----------------------------------------------------------------------
Summary of changes:
diff --git a/bacula/src/dird/ua_output.c b/bacula/src/dird/ua_output.c
index d7e93d0..adef8a5 100644
--- a/bacula/src/dird/ua_output.c
+++ b/bacula/src/dird/ua_output.c
@@ -201,7 +201,10 @@ int show_cmd(UAContext *ua, const char *cmd)
switch (type) {
case -1: /* all */
for (j=r_first; j<=r_last; j++) {
- dump_resource(j, res_head[j-r_first], bsendmsg, ua);
+ /* Skip R_DEVICE since it is really not used or updated */
+ if (j != R_DEVICE) {
+ dump_resource(j, res_head[j-r_first], bsendmsg, ua);
+ }
}
break;
case -2:
diff --git a/bacula/src/qt-console/bcomm/dircomm.cpp b/bacula/src/qt-console/bcomm/dircomm.cpp
index 94ddd6d..b2261f9 100644
--- a/bacula/src/qt-console/bcomm/dircomm.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm.cpp
@@ -371,7 +371,8 @@ int DirComm::read()
case BNET_TEXT_INPUT:
if (mainWin->m_commDebug) Pmsg4(000, "conn %i TEXT_INPUT at_prompt=%d m_in_select=%d notify=%d\n",
m_conn, m_at_prompt, m_in_select, is_notify_enabled());
- if (!m_in_select && is_notify_enabled()) {
+ //if (!m_in_select && is_notify_enabled()) {
+ if (!m_in_select) {
mainWin->waitExit();
new textInputDialog(m_console, m_conn);
} else {
diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp
index 5214978..7c1f55b 100644
--- a/bacula/src/qt-console/main.cpp
+++ b/bacula/src/qt-console/main.cpp
@@ -76,11 +76,11 @@ int main(int argc, char *argv[])
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
QTranslator qtTranslator;
- qtTranslator.load(QString("qt_") + QLocale::system().name());
+ qtTranslator.load(QString("qt_") + QLocale::system().name(),QLibraryInfo::location(QLibraryInfo::TranslationsPath));
app->installTranslator(&qtTranslator);
QTranslator batTranslator;
- batTranslator.load(QString("bat_") + QLocale::system().name());
+ batTranslator.load(QString("bat_") + QLocale::system().name(),QLibraryInfo::location(QLibraryInfo::TranslationsPath));
app->installTranslator(&batTranslator);
register_message_callback(message_callback);
diff --git a/bacula/src/qt-console/select/textinput.ui b/bacula/src/qt-console/select/textinput.ui
index a72fc8a..4991b8f 100644
--- a/bacula/src/qt-console/select/textinput.ui
+++ b/bacula/src/qt-console/select/textinput.ui
@@ -10,47 +10,89 @@
<x>0</x>
<y>0</y>
<width>430</width>
- <height>132</height>
+ <height>96</height>
</rect>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
<property name="windowTitle">
- <string>Selection dialog</string>
+ <string>Text input dialog</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="labelWidget">
- <property name="text">
- <string/>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lineEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>50</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>100</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::TabFocus</enum>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLabel" name="label">
+ <item row="0" column="0">
+ <widget class="QLabel" name="labelWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
- <string>TextLabel</string>
+ <string>Message</string>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="lineEdit"/>
- </item>
- <item row="3" column="1">
+ <item row="2" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>5</number>
+ </property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
- <height>20</height>
+ <width>26</width>
+ <height>9</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>38</height>
+ </size>
+ </property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
hooks/post-receive
--
Bacula Community source
|
