summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-11-16 15:13:23 (UTC)
committer llornkcor <llornkcor>2002-11-16 15:13:23 (UTC)
commit1fde54b44ba888094fc47201567ea9454857f5a1 (patch) (unidiff)
tree955a367a304554a0adc8193a193b31c996a15bf0
parent91b18bba79406b6ff54ca7f1360035eceefee378 (diff)
downloadopie-1fde54b44ba888094fc47201567ea9454857f5a1.zip
opie-1fde54b44ba888094fc47201567ea9454857f5a1.tar.gz
opie-1fde54b44ba888094fc47201567ea9454857f5a1.tar.bz2
fix for filename paths
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/screenshotapplet/screenshot.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index 98f2c9e..266d6d8 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -99,128 +99,130 @@ ScreenshotControl::ScreenshotControl( QWidget *parent, const char *name )
99 grabItButton->setText(tr("Snapshot")); 99 grabItButton->setText(tr("Snapshot"));
100 100
101 101
102 vbox->setMargin( 6 ); 102 vbox->setMargin( 6 );
103 vbox->setSpacing( 3 ); 103 vbox->setSpacing( 3 );
104 104
105 vbox->addWidget( delaySpin); 105 vbox->addWidget( delaySpin);
106 106
107 vbox->setMargin( 6 ); 107 vbox->setMargin( 6 );
108 vbox->setSpacing( 3 ); 108 vbox->setSpacing( 3 );
109 QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); 109 QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
110 vbox->addItem( spacer ); 110 vbox->addItem( spacer );
111 111
112 saveNamedCheck= new QCheckBox ( "name it", this); 112 saveNamedCheck= new QCheckBox ( "name it", this);
113 saveNamedCheck-> setFocusPolicy ( QWidget::NoFocus ); 113 saveNamedCheck-> setFocusPolicy ( QWidget::NoFocus );
114 vbox->addWidget( saveNamedCheck); 114 vbox->addWidget( saveNamedCheck);
115 115
116 116
117 scapButton = new QPushButton( this, "ScapButton" ); 117 scapButton = new QPushButton( this, "ScapButton" );
118 118
119 scapButton ->setFocusPolicy( QWidget::TabFocus ); 119 scapButton ->setFocusPolicy( QWidget::TabFocus );
120 scapButton ->setText(tr("scap")); 120 scapButton ->setText(tr("scap"));
121 if( !QFile("/usr/bin/nc").exists()) 121 if( !QFile("/usr/bin/nc").exists())
122 scapButton->hide(); 122 scapButton->hide();
123 123
124 hbox->addWidget( grabItButton); 124 hbox->addWidget( grabItButton);
125 QSpacerItem* spacer2 = new QSpacerItem( 4, 4, QSizePolicy::Minimum, QSizePolicy::Expanding ); 125 QSpacerItem* spacer2 = new QSpacerItem( 4, 4, QSizePolicy::Minimum, QSizePolicy::Expanding );
126 hbox->addItem( spacer2 ); 126 hbox->addItem( spacer2 );
127 hbox->addWidget( scapButton); 127 hbox->addWidget( scapButton);
128 128
129 vbox->addItem(hbox); 129 vbox->addItem(hbox);
130 130
131 setFixedHeight( 100 ); 131 setFixedHeight( 100 );
132 setFixedWidth( sizeHint().width() ); 132 setFixedWidth( sizeHint().width() );
133 setFocusPolicy(QWidget::NoFocus); 133 setFocusPolicy(QWidget::NoFocus);
134 134
135 grabTimer= new QTimer(this,"grab timer"); 135 grabTimer= new QTimer(this,"grab timer");
136 connect( grabTimer, SIGNAL( timeout() ), this, SLOT( grabTimerDone() ) ); 136 connect( grabTimer, SIGNAL( timeout() ), this, SLOT( grabTimerDone() ) );
137 137
138 delaySpin->setValue(1); 138 delaySpin->setValue(1);
139 connect( grabItButton, SIGNAL(released()), SLOT(slotGrab()) ); 139 connect( grabItButton, SIGNAL(released()), SLOT(slotGrab()) );
140 connect( scapButton, SIGNAL(released()), SLOT(slotScap()) ); 140 connect( scapButton, SIGNAL(released()), SLOT(slotScap()) );
141 connect(saveNamedCheck, SIGNAL(toggled( bool)), this, SLOT( nameScreenshot(bool)) ); 141 connect(saveNamedCheck, SIGNAL(toggled( bool)), this, SLOT( nameScreenshot(bool)) );
142} 142}
143 143
144void ScreenshotControl::slotGrab() { 144void ScreenshotControl::slotGrab() {
145// qDebug("SlotGrab"); 145// qDebug("SlotGrab");
146 buttonPushed=1; 146 buttonPushed=1;
147 hide(); 147 hide();
148 setFileName=FALSE; 148 setFileName=FALSE;
149 if( saveNamedCheck->isChecked()) { 149 if( saveNamedCheck->isChecked()) {
150 setFileName=TRUE; 150 setFileName=TRUE;
151// qDebug("checked"); 151// qDebug("checked");
152 InputDialog *fileDlg; 152 InputDialog *fileDlg;
153 153
154 fileDlg = new InputDialog( 0 ,tr("Name of screenshot "),TRUE, 0); 154 fileDlg = new InputDialog( 0 ,tr("Name of screenshot "),TRUE, 0);
155 fileDlg->exec(); 155 fileDlg->exec();
156 fileDlg->raise(); 156 fileDlg->raise();
157 QString fileName,list; 157 QString fileName,list;
158 if( fileDlg->result() == 1 ) { 158 if( fileDlg->result() == 1 ) {
159 fileName = fileDlg->LineEdit1->text(); 159 fileName = fileDlg->LineEdit1->text();
160 160
161 if(fileName.find("/",0,TRUE)==-1) 161 if(fileName.find("/",0,TRUE)==-1)
162 FileNamePath = QDir::homeDirPath()+"/Documents/image/png/"+fileName; 162 FileNamePath = QDir::homeDirPath()+"/Documents/image/png/"+fileName;
163 else
164 FileNamePath = fileName;
163// qDebug(fileName); 165// qDebug(fileName);
164 166
165 } 167 }
166 delete fileDlg; 168 delete fileDlg;
167 } 169 }
168 if ( delaySpin->value() ) { 170 if ( delaySpin->value() ) {
169 grabTimer->start( delaySpin->value() * 1000, true ); 171 grabTimer->start( delaySpin->value() * 1000, true );
170 } else { 172 } else {
171 show(); 173 show();
172 } 174 }
173} 175}
174 176
175void ScreenshotControl::slotScap() { 177void ScreenshotControl::slotScap() {
176 buttonPushed=2; 178 buttonPushed=2;
177 hide(); 179 hide();
178 if ( delaySpin->value() ) { 180 if ( delaySpin->value() ) {
179 grabTimer->start( delaySpin->value() * 1000, true ); 181 grabTimer->start( delaySpin->value() * 1000, true );
180 } else { 182 } else {
181 show(); 183 show();
182 } 184 }
183} 185}
184 186
185 187
186void ScreenshotControl::grabTimerDone() { 188void ScreenshotControl::grabTimerDone() {
187 performGrab(); 189 performGrab();
188} 190}
189 191
190void ScreenshotControl::savePixmap() { 192void ScreenshotControl::savePixmap() {
191 DocLnk lnk; 193 DocLnk lnk;
192 QString fileName; 194 QString fileName;
193 195
194 if( setFileName) { 196 if( setFileName) {
195 fileName=FileNamePath; 197 fileName=FileNamePath;
196//not sure why this is needed here, but it forgets fileName 198//not sure why this is needed here, but it forgets fileName
197 // if this is below the braces 199 // if this is below the braces
198 200
199 if(fileName.right(3)!="png") 201 if(fileName.right(3)!="png")
200 fileName=fileName+".png"; 202 fileName=fileName+".png";
201 lnk.setFile(fileName); //sets File property 203 lnk.setFile(fileName); //sets File property
202 qDebug("saving file "+fileName); 204 qDebug("saving file "+fileName);
203 snapshot.save( fileName,"PNG"); 205 snapshot.save( fileName,"PNG");
204 QFileInfo fi( fileName); 206 QFileInfo fi( fileName);
205 lnk.setName( fi.fileName()); //sets file name 207 lnk.setName( fi.fileName()); //sets file name
206 208
207 if(!lnk.writeLink()) 209 if(!lnk.writeLink())
208 qDebug("Writing doclink did not work"); 210 qDebug("Writing doclink did not work");
209 } else { 211 } else {
210 212
211 fileName = "sc_"+TimeString::dateString( QDateTime::currentDateTime(),false,true); 213 fileName = "sc_"+TimeString::dateString( QDateTime::currentDateTime(),false,true);
212 fileName.replace(QRegExp("'"),""); fileName.replace(QRegExp(" "),"_"); fileName.replace(QRegExp(":"),"."); fileName.replace(QRegExp(","),""); 214 fileName.replace(QRegExp("'"),""); fileName.replace(QRegExp(" "),"_"); fileName.replace(QRegExp(":"),"."); fileName.replace(QRegExp(","),"");
213 QString dirName = QDir::homeDirPath()+"/Documents/image/png/"; 215 QString dirName = QDir::homeDirPath()+"/Documents/image/png/";
214 216
215 if( !QDir( dirName).exists() ) { 217 if( !QDir( dirName).exists() ) {
216 qDebug("making dir "+dirName); 218 qDebug("making dir "+dirName);
217 QString msg = "mkdir -p "+dirName; 219 QString msg = "mkdir -p "+dirName;
218 system(msg.latin1()); 220 system(msg.latin1());
219 } 221 }
220 fileName=dirName+fileName; 222 fileName=dirName+fileName;
221 if(fileName.right(3)!="png") 223 if(fileName.right(3)!="png")
222 fileName=fileName+".png"; 224 fileName=fileName+".png";
223 lnk.setFile(fileName); //sets File property 225 lnk.setFile(fileName); //sets File property
224 qDebug("saving file "+fileName); 226 qDebug("saving file "+fileName);
225 snapshot.save( fileName,"PNG"); 227 snapshot.save( fileName,"PNG");
226 QFileInfo fi( fileName); 228 QFileInfo fi( fileName);