Changeset 48 in projects
- Timestamp:
- Dec 10, 2009, 3:01:11 AM (14 years ago)
- Location:
- punch-card/punch-card-editor/src
- Files:
-
- 1 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
punch-card/punch-card-editor/src/app/Makefile
r44 r48 1 1 ############################################################################# 2 2 # Makefile for building: ../../bin/app 3 # Generated by qmake (2.01a) (Qt 4.5.1) on: Di. Dez 1 18:50:3420093 # Generated by qmake (2.01a) (Qt 4.5.1) on: Mi. Dez 9 19:05:45 2009 4 4 # Project: app.pro 5 5 # Template: app … … 57 57 ../../bin/moc_navigator.cpp \ 58 58 ../../bin/moc_decktexteditor.cpp \ 59 ../../bin/moc_deckviewer.cpp \ 59 60 ../../bin/moc_card.cpp \ 60 61 ../../bin/moc_format.cpp \ … … 75 76 ../../bin/moc_navigator.o \ 76 77 ../../bin/moc_decktexteditor.o \ 78 ../../bin/moc_deckviewer.o \ 77 79 ../../bin/moc_card.o \ 78 80 ../../bin/moc_format.o \ … … 178 180 dist: 179 181 @$(CHK_DIR_EXISTS) ../../bin/app1.0.0 || $(MKDIR) ../../bin/app1.0.0 180 $(COPY_FILE) --parents $(SOURCES) $(DIST) ../../bin/app1.0.0/ && $(COPY_FILE) --parents editorwindow.h ../qpunchcard/deckmodel.h cardeditor.h navigator.h decktexteditor.h ../qpunchcard/card.h ../qpunchcard/format.h ../qpunchcard/widget.h ../qpunchcard/codec.h ../qpunchcard/cardcodes.h ../../bin/app1.0.0/ && $(COPY_FILE) --parents ../qpunchcard/card.cc ../qpunchcard/widget.cc ../qpunchcard/format.cc ../qpunchcard/codec.cc ../qpunchcard/deckmodel.cc cardeditor.cc navigator.cc decktexteditor.cc main.cc editorwindow.cc ../../bin/app1.0.0/ && (cd `dirname ../../bin/app1.0.0` && $(TAR) app1.0.0.tar app1.0.0 && $(COMPRESS) app1.0.0.tar) && $(MOVE) `dirname ../../bin/app1.0.0`/app1.0.0.tar.gz . && $(DEL_FILE) -r ../../bin/app1.0.0182 $(COPY_FILE) --parents $(SOURCES) $(DIST) ../../bin/app1.0.0/ && $(COPY_FILE) --parents editorwindow.h ../qpunchcard/deckmodel.h cardeditor.h navigator.h decktexteditor.h deckviewer.h ../qpunchcard/card.h ../qpunchcard/format.h ../qpunchcard/widget.h ../qpunchcard/codec.h ../qpunchcard/cardcodes.h ../../bin/app1.0.0/ && $(COPY_FILE) --parents ../qpunchcard/card.cc ../qpunchcard/widget.cc ../qpunchcard/format.cc ../qpunchcard/codec.cc ../qpunchcard/deckmodel.cc cardeditor.cc navigator.cc decktexteditor.cc main.cc editorwindow.cc ../../bin/app1.0.0/ && (cd `dirname ../../bin/app1.0.0` && $(TAR) app1.0.0.tar app1.0.0 && $(COMPRESS) app1.0.0.tar) && $(MOVE) `dirname ../../bin/app1.0.0`/app1.0.0.tar.gz . && $(DEL_FILE) -r ../../bin/app1.0.0 181 183 182 184 … … 197 199 mocables: compiler_moc_header_make_all compiler_moc_source_make_all 198 200 199 compiler_moc_header_make_all: ../../bin/moc_editorwindow.cpp ../../bin/moc_deckmodel.cpp ../../bin/moc_cardeditor.cpp ../../bin/moc_navigator.cpp ../../bin/moc_decktexteditor.cpp ../../bin/moc_ card.cpp ../../bin/moc_format.cpp ../../bin/moc_widget.cpp201 compiler_moc_header_make_all: ../../bin/moc_editorwindow.cpp ../../bin/moc_deckmodel.cpp ../../bin/moc_cardeditor.cpp ../../bin/moc_navigator.cpp ../../bin/moc_decktexteditor.cpp ../../bin/moc_deckviewer.cpp ../../bin/moc_card.cpp ../../bin/moc_format.cpp ../../bin/moc_widget.cpp 200 202 compiler_moc_header_clean: 201 -$(DEL_FILE) ../../bin/moc_editorwindow.cpp ../../bin/moc_deckmodel.cpp ../../bin/moc_cardeditor.cpp ../../bin/moc_navigator.cpp ../../bin/moc_decktexteditor.cpp ../../bin/moc_ card.cpp ../../bin/moc_format.cpp ../../bin/moc_widget.cpp203 -$(DEL_FILE) ../../bin/moc_editorwindow.cpp ../../bin/moc_deckmodel.cpp ../../bin/moc_cardeditor.cpp ../../bin/moc_navigator.cpp ../../bin/moc_decktexteditor.cpp ../../bin/moc_deckviewer.cpp ../../bin/moc_card.cpp ../../bin/moc_format.cpp ../../bin/moc_widget.cpp 202 204 ../../bin/moc_editorwindow.cpp: navigator.h \ 203 205 editorwindow.h \ 204 206 cardeditor.h \ 205 207 decktexteditor.h \ 208 deckviewer.h \ 206 209 editorwindow.h 207 210 /usr/bin/moc $(DEFINES) $(INCPATH) editorwindow.h -o ../../bin/moc_editorwindow.cpp 208 211 209 ../../bin/moc_deckmodel.cpp: ../qpunchcard/card.h \ 212 ../../bin/moc_deckmodel.cpp: editorwindow.h \ 213 navigator.h \ 214 deckviewer.h \ 215 cardeditor.h \ 216 decktexteditor.h \ 217 ../qpunchcard/card.h \ 210 218 ../qpunchcard/format.h \ 211 219 ../qpunchcard/widget.h \ … … 215 223 ../../bin/moc_cardeditor.cpp: editorwindow.h \ 216 224 navigator.h \ 225 deckviewer.h \ 217 226 cardeditor.h \ 218 227 decktexteditor.h \ … … 222 231 ../../bin/moc_navigator.cpp: editorwindow.h \ 223 232 navigator.h \ 233 deckviewer.h \ 224 234 cardeditor.h \ 225 235 decktexteditor.h \ … … 230 240 editorwindow.h \ 231 241 navigator.h \ 242 deckviewer.h \ 232 243 decktexteditor.h \ 233 244 decktexteditor.h 234 245 /usr/bin/moc $(DEFINES) $(INCPATH) decktexteditor.h -o ../../bin/moc_decktexteditor.cpp 246 247 ../../bin/moc_deckviewer.cpp: editorwindow.h \ 248 navigator.h \ 249 deckviewer.h \ 250 cardeditor.h \ 251 decktexteditor.h \ 252 deckviewer.h 253 /usr/bin/moc $(DEFINES) $(INCPATH) deckviewer.h -o ../../bin/moc_deckviewer.cpp 235 254 236 255 ../../bin/moc_card.cpp: ../qpunchcard/format.h \ … … 288 307 289 308 ../../bin/deckmodel.o: ../qpunchcard/deckmodel.cc ../qpunchcard/deckmodel.h \ 309 editorwindow.h \ 310 navigator.h \ 311 deckviewer.h \ 312 cardeditor.h \ 313 decktexteditor.h \ 290 314 ../qpunchcard/card.h \ 291 315 ../qpunchcard/format.h \ … … 296 320 editorwindow.h \ 297 321 navigator.h \ 322 deckviewer.h \ 298 323 decktexteditor.h 299 324 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ../../bin/cardeditor.o cardeditor.cc … … 302 327 editorwindow.h \ 303 328 cardeditor.h \ 304 decktexteditor.h 329 decktexteditor.h \ 330 deckviewer.h 305 331 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ../../bin/navigator.o navigator.cc 306 332 … … 308 334 cardeditor.h \ 309 335 editorwindow.h \ 310 navigator.h 336 navigator.h \ 337 deckviewer.h 311 338 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ../../bin/decktexteditor.o decktexteditor.cc 312 339 313 340 ../../bin/main.o: main.cc editorwindow.h \ 314 341 navigator.h \ 342 deckviewer.h \ 315 343 cardeditor.h \ 316 344 decktexteditor.h … … 319 347 ../../bin/editorwindow.o: editorwindow.cc editorwindow.h \ 320 348 navigator.h \ 349 deckviewer.h \ 321 350 cardeditor.h \ 322 351 decktexteditor.h … … 338 367 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ../../bin/moc_decktexteditor.o ../../bin/moc_decktexteditor.cpp 339 368 369 ../../bin/moc_deckviewer.o: ../../bin/moc_deckviewer.cpp 370 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ../../bin/moc_deckviewer.o ../../bin/moc_deckviewer.cpp 371 340 372 ../../bin/moc_card.o: ../../bin/moc_card.cpp 341 373 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ../../bin/moc_card.o ../../bin/moc_card.cpp -
punch-card/punch-card-editor/src/app/app.pro
r44 r48 6 6 cardeditor.h \ 7 7 navigator.h \ 8 decktexteditor.h 8 decktexteditor.h \ 9 deckviewer.h 9 10 10 11 # raus aus dem src-tree -
punch-card/punch-card-editor/src/app/cardeditor.cc
r47 r48 28 28 } 29 29 30 void CardEditor::fileOpened(bool opened) {30 void CardEditor::fileOpened(bool /*opened*/) { 31 31 // in jedem Fall: Karte entfernen und neuzeichnen 32 32 view->unsetCard(); -
punch-card/punch-card-editor/src/app/decktexteditor.cc
r47 r48 3 3 #include <QPainter> 4 4 #include <QTextBlock> 5 #include <QBoxLayout> 6 #include <QLabel> 7 #include <QComboBox> 8 #include <QPushButton> 5 9 6 10 using namespace QPunchCard; … … 10 14 setWindowTitle(tr("Text Editor")); 11 15 12 // - Codec erstellen oder kriegen13 16 editor = new DeckTextEditor(main); 14 17 … … 17 20 connect(main, SIGNAL(contentsChanged(DeckIndex,DeckIndex)), editor, SLOT(contentsChanged(DeckIndex,DeckIndex))); 18 21 19 // spaeter: oben (in Titelleiste oder drunter) Codeauswahl, 20 // unten Legende mit Farbauswahl 21 setWidget(editor); 22 // urhm... Codebar erstellen 23 create_code_bar(); 24 create_color_bar(); 25 26 // Container-Widget erstellen 27 QWidget* container = new QWidget(this); 28 QVBoxLayout* layout = new QVBoxLayout(container); 29 30 //layout->addWidget(code_bar); 31 layout->addWidget(editor); 32 layout->addWidget(color_bar); 33 34 setWidget(container); 35 setTitleBarWidget(code_bar); 22 36 setFeatures(QDockWidget::AllDockWidgetFeatures); 37 } 38 39 void TextEditorDock::create_code_bar() { 40 code_bar = new QWidget(this); 41 QBoxLayout* layout = new QBoxLayout(QBoxLayout::LeftToRight, code_bar); 42 43 // Label fuer Fenster 44 layout->addWidget(new QLabel(tr("Card Text"), code_bar)); 45 46 // Codec-Auswahlbox 47 QComboBox* codec_selection = new QComboBox(code_bar); 48 codec_selection->addItems( CodecFactory::availableCodecs() ); 49 codec_selection->setStatusTip(tr("Use another codec to display the decks contents as ASCII text. This won't change the cards contents")); 50 connect(codec_selection, SIGNAL(currentIndexChanged(QString)), this, SLOT(setCodec(QString))); 51 layout->addWidget(codec_selection); 52 53 // Button zur Codec-Umwandlung 54 QPushButton* text_converter = new QPushButton(tr("Convert text..."), code_bar); 55 text_converter->setStatusTip(tr("Convert the current deck (or selection) to another punch card code")); 56 connect(text_converter, SIGNAL(clicked()), this, SLOT(showTextConverterDialog())); 57 layout->addWidget(text_converter); 58 } 59 60 void TextEditorDock::create_color_bar() { 61 color_bar = new QWidget(this); 62 // usw. 23 63 } 24 64 25 65 void TextEditorDock::setCard(DeckIndex i) { 26 66 editor->highlightRow(i); 67 } 68 69 void TextEditorDock::setCodec(QString by_name) { 70 // QSharedPointer: Durch Assignment wird das alte Objekt geloescht :-) 71 editor->codec = QSharedPointer<const Codec>( CodecFactory::createCodec(by_name) ); 72 // jetzt: Text komplett neu auswerten. Todo... 73 } 74 75 void TextEditorDock::showTextConverterDialog() { 76 qDebug("Text Converter Dialog... PENDING"); 27 77 } 28 78 … … 41 91 cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor); 42 92 // an dieser Stelle: Ungueltige Zeichen maskieren (per anderem QTextCharFormat)! 43 cursor.insertText(QString("Zeile % dvon Lochkarte").arg(i));93 cursor.insertText(QString("Zeile %1 von Lochkarte").arg(i)); 44 94 } 45 95 } … … 52 102 this, SLOT(translateChanges(int, int, int))); 53 103 104 // Codec erstellen 105 codec = QSharedPointer<const Codec>( CodecFactory::createCodec("o29_code") ); 106 if(!codec) { 107 qDebug("Got NULL Codec :-("); 108 } 54 109 55 110 // Font einstellen … … 76 131 // den Inhalt geaendert hat. => Uebersetzen ins Kartenmodell und als Signal 77 132 // weitergeben. 133 Q_ASSERT(main != 0); 134 Q_ASSERT(main->deck != 0); 78 135 // NATÜRLICH muss ZUSAETZLICH auch noch das MODEL DIREKT VERAENDERT werden. 79 136 // also die betreffenden Karten AUSTAUSCHEN durch den neuen Inhalt, der dann 80 137 // per Codec uebersetzt wird! 81 138 qDebug("Pos: %d, removed: %d, added: %d", position, charsRemoved, charsAdded); 139 // veraenderte Zeilen ausrechnen 140 int start_pos = position; 141 int end_pos = position + charsAdded - charsRemoved; 142 QTextBlock start_block = document()->findBlock(start_pos); 143 QTextBlock end_block = document()->findBlock(end_pos); 144 DeckIndex start_block_number = main->deck->createIndex( start_block.blockNumber() ); 145 DeckIndex end_block_number = main->deck->createIndex( end_block.blockNumber() ); 146 147 if(! start_block.isValid()) { 148 // keine gute Grundlage. 149 qDebug("Pretty bad: Start block pos is invalid."); 150 return; 151 } 152 if(! start_block_number.isValid()) { 153 // auch keine gute Grundlage 154 qDebug("Pretty bad: Start deck index pos is invalid"); 155 qDebug() << start_block_number; 156 return; 157 } 158 159 if(! end_block.isValid()) { 160 // das Dokument ist *kuerzer* geworden 161 DeckIndex new_max_blocks = main->deck->createIndex( document()->lineCount() ); 162 // sicherheitshalber 163 if(! new_max_blocks.isValid()) { 164 qDebug() << "new max blocks is invalid " << new_max_blocks; 165 return; 166 } 167 168 // Alle Blocks von new_max_blocks bis end_block_number loeschen 169 main->deck->erase(new_max_blocks, end_block_number); 170 } 171 172 // start_block und end_block sind innerhalb des Dokumentes. 173 // pruefe, ob Dokument laenger geworden ist 174 175 if(end_block_number > main->deck->count()) { 176 // ja, es sind 177 int new_lines_count = main->deck->count() - end_block_number; 178 // Reihen dazugekommen. 179 qDebug("Inserting %d cards at end", new_lines_count); 180 main->deck->insertTimes( main->deck->createIndex( main->deck->count()-1), new_lines_count); 181 } 182 183 // jetzt: ueber bloecke iterieren. 184 for(QTextBlock current_block = start_block; 185 current_block < end_block || current_block == end_block; 186 current_block = current_block.next()) { 187 if(!translateBlock(current_block)) { 188 qDebug("Translation stopped at block %d, failing. breaking translation", current_block.blockNumber()); 189 break; 190 } 191 } 192 } 193 194 bool DeckTextEditor::translateBlock(const QTextBlock& block) { 195 Q_ASSERT(!codec.isNull()); 196 Q_ASSERT(!main->deck.isNull()); 197 if(! block.isValid()) { 198 // urhh 199 qDebug("translateBlock called on invalid block"); 200 return false; 201 } 202 203 DeckIndex card_index = main->deck->createIndex( block.blockNumber() ); 204 205 // und nun: Block uebersetzen. 206 qDebug() << "Going to translate to " << card_index; 207 QString text = block.text(); 208 qDebug() << "Contents:" << text; 209 210 if(!card_index.isValid()) { 211 qDebug("Invalid card index, won't translate"); 212 return false; 213 } 214 215 if(!codec->canEncode(text)) { 216 // gut, der text ist halt schlecht. sollte an anderer Stelle 217 // schon bemerkt worden sein 218 qDebug("Codec will make errors while translating"); 219 } 220 221 // start translation 222 qDebug() << "starting translation"; 223 codec->fromAscii(text, main->deck->at( card_index ) ); 224 qDebug("Translated successfully"); 225 // urhm... that was all the magic. 226 // send "you were changed" thingy! :-) 227 main->deck->emitChanged(card_index, card_index); 228 return true; 82 229 } 83 230 -
punch-card/punch-card-editor/src/app/decktexteditor.h
r47 r48 4 4 #include <QPlainTextEdit> 5 5 #include <QDockWidget> 6 #include <QSharedPointer> 6 7 7 8 class TextEditorDock; … … 16 17 17 18 EditorWindow* main; 18 QPunchCard::Codec* codec;19 19 DeckTextEditor* editor; 20 QWidget* code_bar; 21 QWidget* color_bar; 20 22 public: 21 23 TextEditorDock(EditorWindow* parent); 22 24 25 private: 26 void create_code_bar(); 27 void create_color_bar(); 28 23 29 public slots: 24 30 void setCard(DeckIndex i); 31 void setCodec(QString by_name); 32 void showTextConverterDialog(); 25 33 26 34 signals: … … 32 40 Q_OBJECT 33 41 34 EditorWindow* main; 42 QPointer<EditorWindow> main; 43 QSharedPointer<const Codec> codec; 44 friend class TextEditorDock; 35 45 36 46 public: … … 53 63 void numberAreaPaintEvent(NumberArea* area, QPaintEvent* event); 54 64 QSize numberAreaSize(const NumberArea* area) const; 65 bool translateBlock(const QTextBlock& block); 55 66 56 67 public slots: -
punch-card/punch-card-editor/src/app/navigator.h
r47 r48 14 14 #include "qpunchcard/deckmodel.h" 15 15 #include "editorwindow.h" 16 //#include "deckviewer.h" 16 17 #include <QResizeEvent> 17 18 #include <QDragEnterEvent> -
punch-card/punch-card-editor/src/qpunchcard/card.cc
r47 r48 27 27 } 28 28 29 bool Deck::move(DeckIndex before, DeckIndex after) { 29 bool Deck::insertTimes(DeckIndex after, int times) { 30 // ja, das ist bloed, aber reicht erst mal: 31 for(;times>0;times--) insert(++after); 32 return true; 33 } 34 35 36 bool Deck::move(DeckIndex /*before*/, DeckIndex /*after*/) { 30 37 // asdasdas 31 38 return true; 39 // emit cardChanged 40 } 41 42 bool Deck::erase(DeckIndex from, DeckIndex to) { 43 qDebug() << "Deck: Erasing from" << from << " to " << to; 44 // main->deck->erase( main->deck->begin() += new_max_blocks+1, 45 // main->deck->begin() += end_block_number+1 ); 46 return true; 47 // emit cardChanged 32 48 } 33 49 … … 73 89 74 90 QDebug QPunchCard::operator<<(QDebug dbg, const DeckIndex &c) { 75 dbg.nospace() << " QPunchCard::DeckIndex: i=" << c.asInt() << ". Has deck: " << c.hasDeck() << "\n";91 dbg.nospace() << "[QPunchCard::DeckIndex: i=" << c.asInt() << ". Has deck: " << c.hasDeck() << "]"; 76 92 return dbg.nospace(); 77 93 } -
punch-card/punch-card-editor/src/qpunchcard/card.h
r47 r48 17 17 18 18 #include "format.h" 19 //#include "codec.h" 19 20 20 21 namespace QPunchCard { … … 123 124 // Bearbeitungsfunktionen 124 125 bool insert(DeckIndex after); // neue Karte hinzufuegen 126 bool insertTimes(DeckIndex after, int times = 1); 125 127 bool move(DeckIndex from, DeckIndex to); 126 128 bool erase(DeckIndex from, DeckIndex to); 129 130 // Quick & dirty 131 inline void emitChanged(DeckIndex lower, DeckIndex upper); 127 132 signals: 128 133 void cardCountChanged(int newCardCount); // wer braucht das? … … 182 187 /// @returns null wenn nicht normalisierbar (also letztlich kein Deck da ist) 183 188 QPointer<Card> getCard() const { return canNormalize() ? deck->at(normalized()) : NULL; } 189 190 DeckIndex& operator++() { i++; return *this; } 191 DeckIndex& operator+=(int x) { i+= x; return *this; } 184 192 }; 185 193 … … 200 208 inline bool Deck::isValid(int i) { return createIndex(i).isValid(); } 201 209 inline DeckIndex Deck::createIndex(int i) { return DeckIndex(this, i); } 202 210 inline void Deck::emitChanged(DeckIndex lower, DeckIndex upper) { 211 emit contentsChanged(lower, upper); 212 } 203 213 204 214 }; // Namespace -
punch-card/punch-card-editor/src/qpunchcard/codec.cc
r47 r48 8 8 9 9 using namespace QPunchCard; 10 11 QString Codec::toAscii(const Card* target_card) const { 12 QString ret; 13 for(int x = 0; x < target_card->length(); x++) { 14 ret += toAscii( &target_card->get(x) ); 15 } 16 return ret; 17 } 18 19 void Codec::fromAscii(const QString& string, Card* target_card) const { 20 if(string.count() > 80) { 21 qDebug() << "Codec: String has "<< string.count() << " chars, will translate 80: " 22 << string << "<<END"; 23 } 24 Q_ASSERT(target_card != 0); 25 for(int x = 0; x < qMin(target_card->length(), string.count()); x++) { 26 target_card->get(x) = fromAscii( string[x].toAscii() ); 27 } 28 } 29 30 bool Codec::canEncode(const QString& string) const { 31 for(int x = 0; x < string.count(); x++) { 32 if(!canEncode( string[x].toAscii() )) 33 return false; 34 } 35 return true; 36 } 10 37 11 38 int Codec::countIllegalColumns(const Card* card) const { -
punch-card/punch-card-editor/src/qpunchcard/codec.h
r47 r48 31 31 virtual ~Codec() {} 32 32 virtual char toAscii(const Column* col) const = 0; 33 virtual QString toAscii(const Card* target_card) const; 33 34 virtual Column fromAscii(char ch) const = 0; 35 void fromAscii(const QString& string, Card* target_card) const; 36 34 37 virtual bool canEncode(const Column* col) const { return toAscii(col) != illegal; } 35 virtual bool canEncode(char ch) const = 0; 38 virtual bool canEncode(char /*char*/ ) const = 0; 39 bool canEncode(const QString& string) const; 36 40 37 41 int countIllegalColumns(const Card* card) const; -
punch-card/punch-card-editor/src/qpunchcard/deckmodel.cc
r47 r48 68 68 card_widget->setCard( main->deck->at(i) ); 69 69 70 qDebug("Zeichne Karte %d von %d", i, deck->count()); 70 // das hier kommt sonst sehr oft... 71 //qDebug("Zeichne Karte %d von %d", i, deck->count()); 71 72 QPixmap ret = QPixmap::grabWidget( card_widget /* cardwidgets[i] */, QRect(QPoint(), icon_size)); 72 73 // sicherheitshalber … … 98 99 99 100 100 void DeckModel::contentsChanged(DeckIndex left, DeckIndex right) {101 void DeckModel::contentsChanged(DeckIndex /*left*/, DeckIndex /*right*/) { 101 102 // Ist halt ein casting DeckIndex -> int -> ModelIndex hier noetig, 102 103 // daher kann man nicht einfach SIGNAL => SIGNAL patchen … … 104 105 // mit dem folgenden sind Laengenaenderungen nicht abgedeckt: 105 106 //emit dataChanged( index(left), index(right)); 106 // dummy damit compiler nicht weint:107 { left + right; }108 107 reset(); 109 108 } -
punch-card/punch-card-editor/src/src.pro.user
r47 r48 83 83 <value type="QString" >CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/ /etc/udev/rules.d /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild</value> 84 84 <value type="QString" >CVS_RSH=ssh</value> 85 <value type="QString" >DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus- XAq30nyORB,guid=134c1bb9a70db62ad2f24a9f4b1e9bb3</value>85 <value type="QString" >DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-uhw0GfKk8Y,guid=e0286bbbef04ed7c603577be4b1fe48d</value> 86 86 <value type="QString" >DCCC_PATH=/usr/lib/distcc/bin</value> 87 87 <value type="QString" >DESKTOP_SESSION=xfce</value> … … 122 122 <value type="QString" >QTDIR=/usr</value> 123 123 <value type="QString" >SANE_CONFIG_DIR=/etc/sane.d</value> 124 <value type="QString" >SESSION_MANAGER=local/sveni:@/tmp/.ICE-unix/392 7,unix/sveni:/tmp/.ICE-unix/3927</value>124 <value type="QString" >SESSION_MANAGER=local/sveni:@/tmp/.ICE-unix/3921,unix/sveni:/tmp/.ICE-unix/3921</value> 125 125 <value type="QString" >SHELL=/bin/bash</value> 126 126 <value type="QString" >SHLVL=1</value> 127 <value type="QString" >SSH_AGENT_PID=391 9</value>128 <value type="QString" >SSH_AUTH_SOCK=/tmp/ssh- vvipbU3918/agent.3918</value>127 <value type="QString" >SSH_AGENT_PID=3913</value> 128 <value type="QString" >SSH_AUTH_SOCK=/tmp/ssh-emYdHV3912/agent.3912</value> 129 129 <value type="QString" >USB_DEVFS_PATH=/dev/bus/usb</value> 130 130 <value type="QString" >USER=sven</value> … … 133 133 <value type="QString" >XDG_CONFIG_DIRS=/etc/xdg</value> 134 134 <value type="QString" >XDG_DATA_DIRS=/usr/local/share:/usr/kde/4.2/share:/usr/kde/3.5/share:/usr/share:/usr/share</value> 135 <value type="QString" >XDG_SESSION_COOKIE=4ca7d15657433fffff2f84004717d7fc-1260 297139.405734-2091533809</value>135 <value type="QString" >XDG_SESSION_COOKIE=4ca7d15657433fffff2f84004717d7fc-1260381324.894938-786350827</value> 136 136 <value type="QString" >XDM_MANAGED=method=classic</value> 137 137 <value type="QString" >_=/usr/bin/xfce4-session</value> … … 160 160 <value type="QString" >CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/ /etc/udev/rules.d /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild</value> 161 161 <value type="QString" >CVS_RSH=ssh</value> 162 <value type="QString" >DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus- XAq30nyORB,guid=134c1bb9a70db62ad2f24a9f4b1e9bb3</value>162 <value type="QString" >DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-uhw0GfKk8Y,guid=e0286bbbef04ed7c603577be4b1fe48d</value> 163 163 <value type="QString" >DCCC_PATH=/usr/lib/distcc/bin</value> 164 164 <value type="QString" >DESKTOP_SESSION=xfce</value> … … 199 199 <value type="QString" >QTDIR=/usr</value> 200 200 <value type="QString" >SANE_CONFIG_DIR=/etc/sane.d</value> 201 <value type="QString" >SESSION_MANAGER=local/sveni:@/tmp/.ICE-unix/392 7,unix/sveni:/tmp/.ICE-unix/3927</value>201 <value type="QString" >SESSION_MANAGER=local/sveni:@/tmp/.ICE-unix/3921,unix/sveni:/tmp/.ICE-unix/3921</value> 202 202 <value type="QString" >SHELL=/bin/bash</value> 203 203 <value type="QString" >SHLVL=1</value> 204 <value type="QString" >SSH_AGENT_PID=391 9</value>205 <value type="QString" >SSH_AUTH_SOCK=/tmp/ssh- vvipbU3918/agent.3918</value>204 <value type="QString" >SSH_AGENT_PID=3913</value> 205 <value type="QString" >SSH_AUTH_SOCK=/tmp/ssh-emYdHV3912/agent.3912</value> 206 206 <value type="QString" >USB_DEVFS_PATH=/dev/bus/usb</value> 207 207 <value type="QString" >USER=sven</value> … … 210 210 <value type="QString" >XDG_CONFIG_DIRS=/etc/xdg</value> 211 211 <value type="QString" >XDG_DATA_DIRS=/usr/local/share:/usr/kde/4.2/share:/usr/kde/3.5/share:/usr/share:/usr/share</value> 212 <value type="QString" >XDG_SESSION_COOKIE=4ca7d15657433fffff2f84004717d7fc-1260 297139.405734-2091533809</value>212 <value type="QString" >XDG_SESSION_COOKIE=4ca7d15657433fffff2f84004717d7fc-1260381324.894938-786350827</value> 213 213 <value type="QString" >XDM_MANAGED=method=classic</value> 214 214 <value type="QString" >_=/usr/bin/xfce4-session</value> … … 233 233 <value type="QString" >CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/ /etc/udev/rules.d /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild</value> 234 234 <value type="QString" >CVS_RSH=ssh</value> 235 <value type="QString" >DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus- i5TbEPyS69,guid=df5ddbcc5e99ee37a66b52c84b1acc98</value>235 <value type="QString" >DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-uhw0GfKk8Y,guid=e0286bbbef04ed7c603577be4b1fe48d</value> 236 236 <value type="QString" >DCCC_PATH=/usr/lib/distcc/bin</value> 237 237 <value type="QString" >DESKTOP_SESSION=xfce</value> … … 272 272 <value type="QString" >QTDIR=/usr</value> 273 273 <value type="QString" >SANE_CONFIG_DIR=/etc/sane.d</value> 274 <value type="QString" >SESSION_MANAGER=local/sveni:@/tmp/.ICE-unix/39 16,unix/sveni:/tmp/.ICE-unix/3916</value>274 <value type="QString" >SESSION_MANAGER=local/sveni:@/tmp/.ICE-unix/3921,unix/sveni:/tmp/.ICE-unix/3921</value> 275 275 <value type="QString" >SHELL=/bin/bash</value> 276 276 <value type="QString" >SHLVL=1</value> 277 <value type="QString" >SSH_AGENT_PID=39 08</value>278 <value type="QString" >SSH_AUTH_SOCK=/tmp/ssh- RXWoZv3907/agent.3907</value>277 <value type="QString" >SSH_AGENT_PID=3913</value> 278 <value type="QString" >SSH_AUTH_SOCK=/tmp/ssh-emYdHV3912/agent.3912</value> 279 279 <value type="QString" >USB_DEVFS_PATH=/dev/bus/usb</value> 280 280 <value type="QString" >USER=sven</value> … … 283 283 <value type="QString" >XDG_CONFIG_DIRS=/etc/xdg</value> 284 284 <value type="QString" >XDG_DATA_DIRS=/usr/local/share:/usr/kde/4.2/share:/usr/kde/3.5/share:/usr/share:/usr/share</value> 285 <value type="QString" >XDG_SESSION_COOKIE=4ca7d15657433fffff2f84004717d7fc-1260 047511.776293-2048873734</value>285 <value type="QString" >XDG_SESSION_COOKIE=4ca7d15657433fffff2f84004717d7fc-1260381324.894938-786350827</value> 286 286 <value type="QString" >XDM_MANAGED=method=classic</value> 287 287 <value type="QString" >_=/usr/bin/xfce4-session</value>
Note: See TracChangeset
for help on using the changeset viewer.