Changeset f3f6162


Ignore:
Timestamp:
01/14/10 12:17:43 (12 years ago)
Author:
fortefr <fortefr@…>
Branches:
master, qt5
Children:
03ff157
Parents:
92995da
Message:

Testing svn, tabs added, misprint fixed

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • src/gui/about.ui

    r92995da rf3f6162  
    1 <ui version="4.0" >
     1<?xml version="1.0" encoding="UTF-8"?>
     2<ui version="4.0">
    23 <class>AboutDialog</class>
    3  <widget class="QDialog" name="AboutDialog" >
    4   <property name="windowModality" >
     4 <widget class="QDialog" name="AboutDialog">
     5  <property name="windowModality">
    56   <enum>Qt::WindowModal</enum>
    67  </property>
    7   <property name="geometry" >
     8  <property name="geometry">
    89   <rect>
    910    <x>0</x>
    … …  
    1314   </rect>
    1415  </property>
    15   <property name="sizePolicy" >
    16    <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
     16  <property name="sizePolicy">
     17   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
    1718    <horstretch>0</horstretch>
    1819    <verstretch>0</verstretch>
    1920   </sizepolicy>
    2021  </property>
    21   <property name="minimumSize" >
     22  <property name="minimumSize">
    2223   <size>
    2324    <width>77</width>
    … …  
    2526   </size>
    2627  </property>
    27   <property name="maximumSize" >
     28  <property name="maximumSize">
    2829   <size>
    2930    <width>500</width>
    … …  
    3132   </size>
    3233  </property>
    33   <property name="palette" >
     34  <property name="palette">
    3435   <palette>
    3536    <active>
    36      <colorrole role="Base" >
    37       <brush brushstyle="SolidPattern" >
    38        <color alpha="255" >
    39         <red>239</red>
    40         <green>235</green>
    41         <blue>231</blue>
    42        </color>
    43       </brush>
    44      </colorrole>
    45      <colorrole role="AlternateBase" >
    46       <brush brushstyle="SolidPattern" >
    47        <color alpha="255" >
     37     <colorrole role="Base">
     38      <brush brushstyle="SolidPattern">
     39       <color alpha="255">
     40        <red>239</red>
     41        <green>235</green>
     42        <blue>231</blue>
     43       </color>
     44      </brush>
     45     </colorrole>
     46     <colorrole role="AlternateBase">
     47      <brush brushstyle="SolidPattern">
     48       <color alpha="255">
    4849        <red>239</red>
    4950        <green>235</green>
    … …  
    5455    </active>
    5556    <inactive>
    56      <colorrole role="Base" >
    57       <brush brushstyle="SolidPattern" >
    58        <color alpha="255" >
    59         <red>239</red>
    60         <green>235</green>
    61         <blue>231</blue>
    62        </color>
    63       </brush>
    64      </colorrole>
    65      <colorrole role="AlternateBase" >
    66       <brush brushstyle="SolidPattern" >
    67        <color alpha="255" >
     57     <colorrole role="Base">
     58      <brush brushstyle="SolidPattern">
     59       <color alpha="255">
     60        <red>239</red>
     61        <green>235</green>
     62        <blue>231</blue>
     63       </color>
     64      </brush>
     65     </colorrole>
     66     <colorrole role="AlternateBase">
     67      <brush brushstyle="SolidPattern">
     68       <color alpha="255">
    6869        <red>239</red>
    6970        <green>235</green>
    … …  
    7475    </inactive>
    7576    <disabled>
    76      <colorrole role="Base" >
    77       <brush brushstyle="SolidPattern" >
    78        <color alpha="255" >
     77     <colorrole role="Base">
     78      <brush brushstyle="SolidPattern">
     79       <color alpha="255">
    7980        <red>255</red>
    8081        <green>255</green>
    … …  
    8384      </brush>
    8485     </colorrole>
    85      <colorrole role="AlternateBase" >
    86       <brush brushstyle="SolidPattern" >
    87        <color alpha="255" >
     86     <colorrole role="AlternateBase">
     87      <brush brushstyle="SolidPattern">
     88       <color alpha="255">
    8889        <red>239</red>
    8990        <green>235</green>
    … …  
    9596   </palette>
    9697  </property>
    97   <property name="windowTitle" >
     98  <property name="windowTitle">
    9899   <string>About application</string>
    99100  </property>
    100   <property name="locale" >
    101    <locale country="AnyCountry" language="C" />
    102   </property>
    103   <layout class="QGridLayout" name="gridLayout" >
    104    <item row="0" column="0" >
    105     <layout class="QHBoxLayout" name="horizontalLayout" >
     101  <property name="locale">
     102   <locale language="C" country="AnyCountry"/>
     103  </property>
     104  <layout class="QGridLayout" name="gridLayout">
     105   <item row="0" column="0">
     106    <layout class="QHBoxLayout" name="horizontalLayout">
    106107     <item>
    107       <layout class="QVBoxLayout" name="verticalLayout" >
    108        <item>
    109         <widget class="QLabel" name="FosdemIcon" >
    110          <property name="sizePolicy" >
    111           <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
     108      <layout class="QVBoxLayout" name="verticalLayout">
     109       <item>
     110        <widget class="QLabel" name="FosdemIcon">
     111         <property name="sizePolicy">
     112          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
    112113           <horstretch>0</horstretch>
    113114           <verstretch>0</verstretch>
    114115          </sizepolicy>
    115116         </property>
    116          <property name="text" >
     117         <property name="text">
    117118          <string/>
    118119         </property>
    119          <property name="pixmap" >
    120           <pixmap resource="../icons.qrc" >:/icons/fosdem.png</pixmap>
     120         <property name="pixmap">
     121          <pixmap>:/icons/fosdem.png</pixmap>
    121122         </property>
    122123        </widget>
    123124       </item>
    124125       <item>
    125         <spacer name="verticalSpacer" >
    126          <property name="orientation" >
     126        <spacer name="verticalSpacer">
     127         <property name="orientation">
    127128          <enum>Qt::Vertical</enum>
    128129         </property>
    129          <property name="sizeHint" stdset="0" >
     130         <property name="sizeHint" stdset="0">
    130131          <size>
    131132           <width>20</width>
    … …  
    138139     </item>
    139140     <item>
    140       <layout class="QVBoxLayout" name="verticalLayout_2" >
    141        <item>
    142         <widget class="QTextBrowser" name="textBrowser" >
    143          <property name="enabled" >
    144           <bool>true</bool>
    145          </property>
    146          <property name="autoFillBackground" >
    147           <bool>true</bool>
    148          </property>
    149          <property name="locale" >
    150           <locale country="AnyCountry" language="C" />
    151          </property>
    152          <property name="frameShape" >
     141      <layout class="QVBoxLayout" name="verticalLayout_2">
     142       <item>
     143        <widget class="QTextBrowser" name="textBrowser">
     144         <property name="enabled">
     145          <bool>true</bool>
     146         </property>
     147         <property name="autoFillBackground">
     148          <bool>true</bool>
     149         </property>
     150         <property name="locale">
     151          <locale language="C" country="AnyCountry"/>
     152         </property>
     153         <property name="frameShape">
    153154          <enum>QFrame::NoFrame</enum>
    154155         </property>
    155          <property name="frameShadow" >
     156         <property name="frameShadow">
    156157          <enum>QFrame::Plain</enum>
    157158         </property>
    158          <property name="readOnly" >
    159           <bool>true</bool>
    160          </property>
    161          <property name="html" >
    162           <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
    163 &lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
     159         <property name="readOnly">
     160          <bool>true</bool>
     161         </property>
     162         <property name="html">
     163          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
     164&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    164165p, li { white-space: pre-wrap; }
    165 &lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
    166 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600; color:#000000;">Qt FOSDEM/Maemo&lt;/span>&lt;/p>
    167 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;">&lt;span style=" font-family:'Sans Serif'; font-size:9pt; color:#000000;">Version 1.0.0.&lt;/span>&lt;/p>
    168 &lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>
    169 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;">The FOSDEM Maemo is an application making the conference schedule available offline. Supports searches on various items (speaker, speech topic, location, etc.). For Nokia N8x0 and N900 Internet Tablets.&lt;/p>
    170 &lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;">&lt;/p>
    171 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;">&lt;span style=" font-weight:600; color:#000000;">Developers:&lt;/span>&lt;/p>
    172 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;">&lt;span style=" color:#000000;">Berendova Monika, Hanzes Matus, Komara Martin, Korinek Pavol,&lt;/span>&lt;/p>
    173 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt; color:#000000;">Pavelka Pavol, Timko Marek, Uzak Matus&lt;/p>
    174 &lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;">&lt;/p>
    175 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;">&lt;span style=" color:#000000;">Copyright (C) Ixonos, 2010&lt;/span>&lt;/p>
    176 &lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;">&lt;/p>
    177 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;">&lt;span style=" font-size:7pt; color:#000000;">This program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR PARTICULAR PURPOSE.&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
    178          </property>
    179          <property name="overwriteMode" >
     166&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
     167&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:600; color:#000000;&quot;&gt;Qt FOSDEM/Maemo&lt;/span&gt;&lt;/p&gt;
     168&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt; color:#000000;&quot;&gt;Version 1.0.0.&lt;/span&gt;&lt;/p&gt;
     169&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;&lt;/p&gt;
     170&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;The FOSDEM Maemo is an application making the conference schedule available offline. Supports searches on various items (speaker, speech topic, location, etc.). For Nokia N8x0 and N900 Internet Tablets.&lt;/span&gt;&lt;/p&gt;
     171&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;/p&gt;
     172&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; color:#000000;&quot;&gt;Developers:&lt;/span&gt;&lt;/p&gt;
     173&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; color:#000000;&quot;&gt;Berendova Monika, Hanzes Matus, Komara Martin, Korinek Pavol,&lt;/span&gt;&lt;/p&gt;
     174&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; color:#000000;&quot;&gt;Pavelka Pavol, Timko Marek, Uzak Matus, Fortes Francisco.&lt;/span&gt;&lt;/p&gt;
     175&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;/p&gt;
     176&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; color:#000000;&quot;&gt;Copyright (C) Ixonos, 2010&lt;/span&gt;&lt;/p&gt;
     177&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;/p&gt;
     178&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:7pt; color:#000000;&quot;&gt;This program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR PARTICULAR PURPOSE.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     179         </property>
     180         <property name="overwriteMode">
    180181          <bool>false</bool>
    181182         </property>
    182          <property name="acceptRichText" >
     183         <property name="acceptRichText">
    183184          <bool>true</bool>
    184185         </property>
    … …  
    186187       </item>
    187188       <item>
    188         <widget class="QDialogButtonBox" name="buttonOK" >
    189          <property name="standardButtons" >
     189        <widget class="QDialogButtonBox" name="buttonOK">
     190         <property name="standardButtons">
    190191          <set>QDialogButtonBox::Ok</set>
    191192         </property>
    … …  
    198199  </layout>
    199200 </widget>
    200  <resources>
    201   <include location="../icons.qrc" />
    202   <include location="../icons.qrc" />
    203  </resources>
     201 <resources/>
    204202 <connections>
    205203  <connection>
    … …  
    209207   <slot>close()</slot>
    210208   <hints>
    211     <hint type="sourcelabel" >
     209    <hint type="sourcelabel">
    212210     <x>292</x>
    213211     <y>272</y>
    214212    </hint>
    215     <hint type="destinationlabel" >
     213    <hint type="destinationlabel">
    216214     <x>249</x>
    217215     <y>149</y>

  • src/gui/mainwindow.ui

    r92995da rf3f6162  
    1 <ui version="4.0" >
     1<?xml version="1.0" encoding="UTF-8"?>
     2<ui version="4.0">
    23 <class>MainWindow</class>
    3  <widget class="QMainWindow" name="MainWindow" >
    4   <property name="geometry" >
     4 <widget class="QMainWindow" name="MainWindow">
     5  <property name="geometry">
    56   <rect>
    67    <x>0</x>
    … …  
    1011   </rect>
    1112  </property>
    12   <property name="windowTitle" >
     13  <property name="windowTitle">
    1314   <string>MainWindow</string>
    1415  </property>
    15   <widget class="QWidget" name="centralwidget" >
    16    <layout class="QGridLayout" name="gridLayout" >
    17     <item row="0" column="0" >
    18      <widget class="QTabWidget" name="tabWidget" >
    19       <property name="currentIndex" >
    20        <number>0</number>
     16  <widget class="QWidget" name="centralwidget">
     17   <layout class="QGridLayout" name="gridLayout">
     18    <item row="0" column="0">
     19     <widget class="QTabWidget" name="tabWidget">
     20      <property name="currentIndex">
     21       <number>4</number>
    2122      </property>
    22       <widget class="QWidget" name="dayViewTab" >
    23        <attribute name="title" >
     23      <widget class="QWidget" name="dayViewTab">
     24       <attribute name="title">
    2425        <string>Day View</string>
    2526       </attribute>
    26        <layout class="QGridLayout" name="gridLayout_2" >
    27         <item row="0" column="0" >
    28          <layout class="QVBoxLayout" name="verticalLayout" >
     27       <layout class="QGridLayout" name="gridLayout_2">
     28        <item row="0" column="0">
     29         <layout class="QVBoxLayout" name="verticalLayout">
    2930          <item>
    30            <widget class="DayNavigatorWidget" native="1" name="dayNavigator" />
     31           <widget class="DayNavigatorWidget" name="dayNavigator" native="true"/>
    3132          </item>
    3233          <item>
    33            <widget class="TreeView" name="treeView" >
    34             <property name="maximumSize" >
     34           <widget class="TreeView" name="treeView">
     35            <property name="maximumSize">
    3536             <size>
    3637              <width>16777215</width>
    … …  
    4445       </layout>
    4546      </widget>
    46       <widget class="QWidget" name="favouritiesTab" >
    47        <attribute name="title" >
    48         <string>Favourities</string>
     47      <widget class="QWidget" name="activitiesTab">
     48       <attribute name="title">
     49        <string>Activities</string>
     50       </attribute>
     51      </widget>
     52      <widget class="QWidget" name="favouritesTab">
     53       <attribute name="title">
     54        <string>Favourites</string>
     55       </attribute>
     56      </widget>
     57      <widget class="QWidget" name="searchTab">
     58       <attribute name="title">
     59        <string>Search</string>
     60       </attribute>
     61      </widget>
     62      <widget class="QWidget" name="mapTab">
     63       <attribute name="title">
     64        <string>Map</string>
    4965       </attribute>
    5066      </widget>
    … …  
    5369   </layout>
    5470  </widget>
    55   <widget class="QMenuBar" name="menubar" >
    56    <property name="geometry" >
     71  <widget class="QMenuBar" name="menubar">
     72   <property name="geometry">
    5773    <rect>
    5874     <x>0</x>
    5975     <y>0</y>
    6076     <width>856</width>
    61      <height>26</height>
     77     <height>24</height>
    6278    </rect>
    6379   </property>
    64    <widget class="QMenu" name="menuFile" >
    65     <property name="title" >
     80   <widget class="QMenu" name="menuFile">
     81    <property name="title">
    6682     <string>File</string>
    6783    </property>
    68     <addaction name="actionImportSchedule" />
     84    <addaction name="actionImportSchedule"/>
    6985   </widget>
    70    <widget class="QMenu" name="menuAbout" >
    71     <property name="title" >
     86   <widget class="QMenu" name="menuAbout">
     87    <property name="title">
    7288     <string>Help</string>
    7389    </property>
    74     <addaction name="actionAboutQt" />
    75     <addaction name="actionAboutApplication" />
     90    <addaction name="actionAboutQt"/>
     91    <addaction name="actionAboutApplication"/>
    7692   </widget>
    77    <addaction name="menuFile" />
    78    <addaction name="menuAbout" />
     93   <addaction name="menuFile"/>
     94   <addaction name="menuAbout"/>
    7995  </widget>
    80   <widget class="QStatusBar" name="statusbar" />
    81   <action name="actionImportSchedule" >
    82    <property name="text" >
     96  <widget class="QStatusBar" name="statusbar"/>
     97  <action name="actionImportSchedule">
     98   <property name="text">
    8399    <string>Import Schedule</string>
    84100   </property>
    85101  </action>
    86   <action name="actionAboutQt" >
    87    <property name="text" >
     102  <action name="actionAboutQt">
     103   <property name="text">
    88104    <string>About Qt</string>
    89105   </property>
    90106  </action>
    91   <action name="actionAboutApplication" >
    92    <property name="text" >
     107  <action name="actionAboutApplication">
     108   <property name="text">
    93109    <string>About application</string>
    94110   </property>

  • src/orm/ormrecord.h

    r92995da rf3f6162  
    107107                QString end = "\nEND\n";
    108108                QString message = start + query.lastError().text() + end;
    109                 const char *data = message.toLatin1().data();
    110                 qDebug(data);
     109                const char *data = message.toLatin1().data();
     110                qDebug(data);
    111111            throw new OrmSqlException(query.lastError().text());
    112112        }
Note: See TracChangeset for help on using the changeset viewer.