copy/paste fixes.

svn path=/trunk/kdebase/konsole/; revision=38115
wilder-portage
Lars Doelle 27 years ago
parent a957231091
commit 7fea075d39
  1. 12
      src/Makefile.am
  2. 16
      src/TEScreen.C
  3. 13
      src/TEWidget.C
  4. 38
      src/TEmuVt102.C
  5. 12
      src/TEmulation.C
  6. 511
      src/kcmkonsole.C
  7. 10
      src/main.C

@ -19,7 +19,7 @@ OTHDIR = $(TOPDIR)/other
INCLUDES = -I$(INCDIR) $(all_includes)
# you can add here more. This one gets installed
bin_PROGRAMS = konsole kcmkonsole konsole_grantpty kwrited
bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole
noinst_LIBRARIES = libkonsole.a
@ -36,9 +36,9 @@ konsole_SOURCES = main.C schema.C session.C krootpixmap.cpp
konsole_LDADD = libkonsole.a $(LIB_KIMGIO) $(LIB_KDEUI) $(LIBUTEMPTER)
konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
kcmkonsole_SOURCES = kcmkonsole.C schema.C
kcmkonsole_LDADD = $(LIB_KIMGIO) $(LIB_KDEUI)
kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
# kcmkonsole_SOURCES = kcmkonsole.C schema.C
# kcmkonsole_LDADD = $(LIB_KIMGIO) $(LIB_KDEUI)
# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
konsole_grantpty_SOURCES = konsole_grantpty.c
konsole_grantpty_LDFLAGS = $(KDE_RPATH)
@ -55,8 +55,8 @@ install-exec-local: install-binPROGRAMS
# just to make sure, automake makes them
METASOURCES =TEWidget.moc TEmuVt102.moc session.moc main.moc \
TEmulation.moc TEShell.moc kcmkonsole.moc kwrited.moc \
krootpixmap.moc
TEmulation.moc TEShell.moc kwrited.moc \
krootpixmap.moc #kcmkonsole.moc
META_INCLUDES = $(srcdir)/../include

@ -976,9 +976,9 @@ void TEScreen::setSelExtentXY(const int x, const int y)
}
}
char *TEScreen::getSelText(const BOOL preserve_line_breaks)
QString TEScreen::getSelText(const BOOL preserve_line_breaks)
{
char *m; // buffer to fill.
int *m; // buffer to fill.
int s,d; // source index, dest. index.
int hist_BR=loc(0,hist.getLines()-1);
int hY = sel_TL / columns ;
@ -989,7 +989,7 @@ char *TEScreen::getSelText(const BOOL preserve_line_breaks)
// allocate buffer for maximum possible size...
d = (sel_BR - sel_TL)/columns + 1 ;
m = (char*) malloc( d * (columns+1) + 2 );
m = new int[ d * (columns+1) + 2 ];
d = 0;
while ( s <= sel_BR )
@ -1040,10 +1040,12 @@ char *TEScreen::getSelText(const BOOL preserve_line_breaks)
}
}
// trim buffer size to actual size needed.
m=(char*)realloc( m , sizeof(char)*(d+1) );
m[d]= '\0';
return(m);
QChar* qc = new QChar[d];
for (int i = 0; i < d; i++)
qc[i] = m[i];
QString res(qc,d);
delete m; delete qc;
return res;
}
/* above ... end of line processing for selection -- psilva
cases:

@ -550,7 +550,7 @@ void TEWidget::setScrollbarLocation(int loc)
void TEWidget::mousePressEvent(QMouseEvent* ev)
{
printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
//printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
if ( !contentsRect().contains(ev->pos()) ) return;
QPoint tL = contentsRect().topLeft();
int tLx = tL.x();
@ -783,7 +783,7 @@ void TEWidget::setMouseMarks(bool on)
void TEWidget::emitSelection()
// Paste Clipboard by simulating keypress events
{
QString text = QApplication::clipboard()->text();
QString text = QApplication::clipboard()->text();
if ( ! text.isNull() ) {
text.replace(QRegExp("\n"), "\r");
QKeyEvent e(QEvent::KeyPress, 0,-1,0, text);
@ -792,7 +792,7 @@ void TEWidget::emitSelection()
}
}
void TEWidget::setSelection(const char *t)
void TEWidget::setSelection(const QString& t)
{
// Disconnect signal while WE set the clipboard
QObject *cb = QApplication::clipboard();
@ -803,7 +803,6 @@ void TEWidget::setSelection(const char *t)
QObject::connect( cb, SIGNAL(dataChanged()),
this, SLOT(onClearSelection()) );
return;
}
void TEWidget::onClearSelection()
@ -887,9 +886,9 @@ void TEWidget::fontChange(const QFont &)
font_w = fontMetrics().maxWidth();
font_a = fontMetrics().ascent();
HERE;
printf("font_h: %d\n",font_h);
printf("font_w: %d\n",font_w);
printf("font_a: %d\n",font_a);
//printf("font_h: %d\n",font_h);
//printf("font_w: %d\n",font_w);
//printf("font_a: %d\n",font_a);
printf("charset: %s\n",QFont::encodingName(font().charSet()).ascii());
printf("rawname: %s\n",font().rawName().ascii());

@ -957,18 +957,37 @@ void VT102Emulation::onKeyPress( QKeyEvent* ev )
if (scr->getHistCursor() != scr->getHistLines());
scr->setHistCursor(scr->getHistLines());
//printf("State/Key: 0x%04x 0x%04x (%d,%d)\n",ev->state(),ev->key(),ev->text().length(),ev->text().length()?ev->text().ascii()[0]:0);
// Note: there 3 ways in rxvt to handle the Meta (Alt) key
// 1) ignore it
// 2) preceed the keycode by ESC (what we do here)
// 3) set the 8th bit of each char in string
// (which may fail for 8bit (european) characters.
if (ev->state() & AltButton) sendString("\033"); // ESC
printf("State/Key: 0x%04x 0x%04x (%d,%d)\n",ev->state(),ev->key(),ev->text().length(),ev->text().length()?ev->text().ascii()[0]:0);
if (!ev->text().isEmpty())
{
if (ev->text().length() == 1 && (ev->state() & AltButton))
sendString("\033"); // ESC, this is the ALT prefix
QCString s = codec->fromUnicode(ev->text());
emit sndBlock(s.data(),s.length());
return;
}
if (0 < ev->ascii() && ev->ascii() < 32)
{ char c[1];
c[0] = ev->ascii();
emit sndBlock((char*)c,1);
return;
}
key = ev->key();
if (0x1000 <= key && key <= 0x10ff)
switch (key)
{
case Key_Escape : sendString("\033"); return;
case Key_Tab : sendString("\t"); return;
case Key_Return : sendString(getMode(MODE_NewLine)?"\r\n" :"\r" ); return;
case Key_Backspace : sendString(getMode(MODE_BsHack )?"\x7f" :"\x08"); return;
case Key_Delete : sendString(getMode(MODE_BsHack )?"\033[3~":"\x7f"); return;
@ -998,6 +1017,7 @@ printf("State/Key: 0x%04x 0x%04x (%d,%d)\n",ev->state(),ev->key(),ev->text().len
case Key_Next : sendString("\033[6~" ); return;
case Key_Insert : sendString("\033[2~" ); return;
//FIXME: get keypad somehow
default : return;
}
if (KeyComb(ControlButton,Key_Space)) // ctrl-Space == ctrl-@
{
@ -1007,18 +1027,4 @@ printf("State/Key: 0x%04x 0x%04x (%d,%d)\n",ev->state(),ev->key(),ev->text().len
{
reportAnswerBack(); return;
}
if (!ev->text().isEmpty())
{
if (0 <= ev->ascii() && ev->ascii() < 32)
{ char c[1];
c[0] = ev->ascii();
emit sndBlock((char*)c,1);
}
else
{
QTextCodec* loc = QTextCodec::codecForLocale();
QCString s = codec->fromUnicode(loc->toUnicode(ev->text()));
emit sndBlock(s.data(),s.length());
}
}
}

@ -180,6 +180,9 @@ void Emulation::onKeyPress( QKeyEvent* ev )
scr->setHistCursor(scr->getHistLines());
if (!ev->text().isEmpty())
{ // A block of text
// Note that the text is proper unicode.
// We should do a conversion here, but since this
// routine will never be used, we simply emit plain ascii.
emit sndBlock(ev->text().ascii(),ev->text().length());
}
else if (ev->ascii()>0)
@ -218,11 +221,10 @@ void Emulation::onSelectionExtend(const int x, const int y) {
void Emulation::setSelection(const BOOL preserve_line_breaks) {
if (!connected) return;
char *t = scr->getSelText(preserve_line_breaks);
if (t != NULL ) {
gui->setSelection(t);
free(t);
}
QString t = scr->getSelText(preserve_line_breaks);
HERE;printf("Text >%s< %d\n",t.latin1(),t.length());
if (t) gui->setSelection(t);
HERE;
}
void Emulation::clearSelection() {

@ -1,511 +0,0 @@
/*
[kcmkonsole.C] Konsole Configurator for Kcontrol
Copyright (c) 1998 by Lars Doelle.
Artistic License applies.
*/
/*! /program
These are some configuration pages for Kcontrol.
*/
#include "kcmkonsole.h"
#include "schema.h"
#include "qlayout.h"
#include "qpushbutton.h"
#include "qtooltip.h"
#include "qpixmap.h"
#include "qslider.h"
#include <kiconloader.h>
#include <stdio.h>
#include <kstddirs.h>
#include <klocale.h>
#include <kglobal.h>
#define HERE fprintf(stderr,"%s(%d): here\n",__FILE__,__LINE__);
//--| Overall apearance |-------------------------------------------------------
PageFrame::PageFrame(QWidget* parent) : QWidget(parent)
{
}
void PageFrame::Contents(const char* header, QWidget* body, const char* footer)
{
QBoxLayout *topLayout = new QVBoxLayout( this, 5 );
QLabel *title = new QLabel( header, this );
title->setBuddy(title);
title->setMinimumSize( title->sizeHint() );
// Make a big widget that will grab all space in the middle.
topLayout->addWidget( title, 1 );
topLayout->addWidget( body, 1000 );
// Add a widget at the bottom.
QLabel* sb = new QLabel(this);
sb->setFrameStyle( QFrame::Box | QFrame::Sunken );
topLayout->addWidget( sb , 2);
QBoxLayout *sbl = new QHBoxLayout( sb,5,5 );
QLabel* logo = new QLabel(sb);
QPixmap pm = KGlobal::iconLoader()->loadIcon(locate("icon","konsole"));
logo->setPixmap(pm);
logo->setAlignment( AlignCenter );
logo->setMinimumSize( logo->sizeHint() );
sbl->addWidget( logo , 2);
QLabel* footext = new QLabel(sb);
footext->setText(footer);
footext->setAlignment( WordBreak );
sbl->addWidget( footext , 1000);
sbl->activate();
topLayout->activate();
}
PageFrame::~PageFrame()
{
}
//--| Schema configuration |----------------------------------------------------
GeneralPage::GeneralPage(QWidget* parent) : PageFrame(parent)
{
QLabel *bigWidget = new QLabel( i18n("This is work in progress."), this );
bigWidget->setFrameStyle( QFrame::Panel | QFrame::Sunken );
bigWidget->setAlignment( AlignCenter );
bigWidget->setBackgroundMode(PaletteBase);
//bigWidget->setMinimumHeight(400);
Contents
( i18n(
"General Konsole settings"
),
bigWidget,
i18n(
"{summary on konsole's general attributes.}"
)
);
}
GeneralPage::~GeneralPage()
{
}
//--| some algebra on colors |---------------------------------------------------
/*
Please don't take this hack here too serious. It attempts
to do a sort of tv set control for color adjustments.
(The author hereby denies all rumours that this is an
indication of secret ongoing works on a tv emulator.
He also denies that konsole will be renamed to ktv. ;^)
The color adjustment made here are based on an RGB cube.
Black is at (0,0,0), while White is at (1,1,1).
Arraging a subcube from (a,a,a) to (b,b,b), we treat the
length of its diagonal as "contrast" and the location of
it's center as "brightness".
The diagonal of the subcube contains only different sorts of
gray. By mapping the luminence of the colors to it's gray
equivalent, we can make a sort of "color intensity" mapping
also, that has the full colors at one and the gray levels
at it's other end.
*/
class Tripel
{
public:
Tripel();
Tripel(float dia);
Tripel(float r, float g, float b);
Tripel(QColor c);
public: // all [0..1]
float r;
float g;
float b;
public:
QColor color();
public:
Tripel scale(float f);
static Tripel add(const Tripel &a, const Tripel &b);
static Tripel linear(const Tripel &p0, const Tripel &p1, float f);
Tripel togray(float f);
public:
void print();
};
Tripel::Tripel()
{
r = 0;
g = 0;
b = 0;
}
Tripel::Tripel(float dia)
{
r = dia;
g = dia;
b = dia;
}
Tripel::Tripel(float r, float g, float b)
{
this->r = r;
this->g = g;
this->b = b;
}
Tripel::Tripel(QColor c)
{
this->r = c.red () / 255.0;
this->g = c.green() / 255.0;
this->b = c.blue () / 255.0;
}
QColor Tripel::color()
{
return QColor(r*255,g*255,b*255);
}
void Tripel::print()
{
printf("Tripel(%4.2f,%4.2f,%4.2f)\n",r,g,b);
}
Tripel Tripel::scale(float f)
{
return Tripel(f*r,f*g,f*b);
}
Tripel Tripel::add(const Tripel &a, const Tripel &b)
{
return Tripel(a.r+b.r, a.g+b.g, a.b+b.b);
}
Tripel Tripel::linear(const Tripel &p0, const Tripel &p1, float f)
{
return Tripel
( f*(p1.r - p0.r) + p0.r,
f*(p1.b - p0.b) + p0.b,
f*(p1.g - p0.g) + p0.g
);
}
Tripel Tripel::togray(float f)
{
// If your are tuning the luminescense factors to match the
// phosphor of your monitor, note that they have to total to 1.
Tripel rp = Tripel::linear(Tripel(0.34*r),Tripel(r,0,0),f);
Tripel bp = Tripel::linear(Tripel(0.16*b),Tripel(0,b,0),f);
Tripel gp = Tripel::linear(Tripel(0.50*g),Tripel(0,0,g),f);
return Tripel::add( rp, Tripel::add( bp, gp ));
}
//--| Schema configuration |----------------------------------------------------
ColorTable::ColorTable(QWidget* parent, int lower, int upper) : QLabel(parent)
{
//setFrameStyle( QFrame::Panel | QFrame::Sunken );
//setFrameStyle( QFrame::WinPanel | QFrame::Sunken );
this->lower = lower;
this->upper = upper;
setAlignment(AlignCenter);
setBackgroundMode(PaletteBase);
schema = (ColorSchema*)NULL;
scale = 1;
}
//void ColorTable::resizeEvent(QResizeEvent* e)
//{
//}
void ColorTable::setSchema(ColorSchema* s)
{
schema = s;
setText("");
setBackgroundMode(schema?NoBackground:PaletteBase);
if (!schema) return;
char* pa = (char*)strrchr(s->path.data(),'/');
setText(pa&&*pa?pa+1:"/* build-in schema */");
update();
}
void ColorTable::paintEvent(QPaintEvent* )
{
// in the moment we don't care and paint the whole bunch
// we don't care about all the tricks, also.
QPainter paint;
paint.begin( this );
if (schema)
for (int y = lower; y <= upper; y++)
{
QRect base = frameRect();
int top = base.height()*((y-lower)+0)/(upper-lower+1);
int bot = base.height()*((y-lower)+1)/(upper-lower+1);
QRect rect(QPoint(base.left(),top),QPoint(base.right(),bot));
QColor c0 = schema->table[y].color;
float off = shift * (1 - scale);
Tripel t0(c0);
Tripel t2(off);
Tripel t3 = Tripel::add( t0.scale(scale), t2 );
Tripel t4 = t3.togray(color);
paint.fillRect(rect, t4.color() );
}
//drawFrame(&paint);
paint.end();
}
SchemaConfig::SchemaConfig(QWidget* parent) : PageFrame(parent)
{
QLabel *bigWidget = new QLabel(this); //( i18n("This is work in progress."), this );
bigWidget->setFrameStyle( QFrame::Panel | QFrame::Sunken );
bigWidget->setAlignment( AlignCenter );
QGridLayout* topLayout = new QGridLayout( bigWidget, 4, 3, 5 );
topLayout->setColStretch(0,1);
topLayout->setColStretch(1,1);
topLayout->setColStretch(2,1);
topLayout->setRowStretch(0,1);
topLayout->setRowStretch(1,1);
topLayout->setRowStretch(2,8);
topLayout->setRowStretch(3,2);
//topLayout->addWidget( colorTableW, 0, 0 );
lbox = new QListBox(bigWidget); //FIXME: QT does not react on setFrameStyle
//lbox->setFrameStyle( QFrame::Panel | QFrame::Sunken );
QToolTip::add(lbox,i18n("color schema selection"));
topLayout->addMultiCellWidget( lbox, 2,2, 2,2 );
colorTableW[0] = new ColorTable(bigWidget, 0, 0);
colorTableW[1] = new ColorTable(bigWidget, 1, 1);
colorTableW[2] = new ColorTable(bigWidget, 2, 9);
colorTableW[3] = new ColorTable(bigWidget,10,10);
colorTableW[4] = new ColorTable(bigWidget,11,11);
colorTableW[5] = new ColorTable(bigWidget,12,19);
QToolTip::add(colorTableW[0],i18n("regular foreground color"));
QToolTip::add(colorTableW[1],i18n("regular background color"));
QToolTip::add(colorTableW[2],i18n("regular rgb color palette"));
QToolTip::add(colorTableW[3],i18n("intensive foreground color"));
QToolTip::add(colorTableW[4],i18n("intensive background color"));
QToolTip::add(colorTableW[5],i18n("intensive rgb color palette"));
topLayout->addWidget(colorTableW[0], 0,0);
topLayout->addWidget(colorTableW[1], 1,0);
topLayout->addWidget(colorTableW[2], 2,0);
topLayout->addWidget(colorTableW[3], 0,1);
topLayout->addWidget(colorTableW[4], 1,1);
topLayout->addWidget(colorTableW[5], 2,1);
QGridLayout* slayout = new QGridLayout(3,2,5);
topLayout->addLayout( slayout, 3,0 );
slayout->setColStretch(0,1);
slayout->setColStretch(1,2);
QPixmap pm0 = BarIcon(QString("contrast"));
QLabel* ll0 = new QLabel(bigWidget);
ll0->setPixmap(pm0);
ll0->setFixedSize( ll0->sizeHint() );
sl0 = new QSlider(0,100,10,0,QSlider::Horizontal,bigWidget);
sl0->setTickmarks(QSlider::Below);
slayout->addWidget(ll0,0,0);
slayout->addWidget(sl0,0,1);
QObject::connect( sl0, SIGNAL(valueChanged(int)),
this, SLOT(sl0ValueChanged(int)) );
QToolTip::add(sl0,i18n("Contrast"));
QToolTip::add(ll0,i18n("Contrast"));
QPixmap pm1 = BarIcon("brightness");
QLabel* ll1 = new QLabel(bigWidget);
ll1->setPixmap(pm1);
ll1->setFixedSize( ll1->sizeHint() );
sl1 = new QSlider(0,100,10,0,QSlider::Horizontal,bigWidget);
sl1->setTickmarks(QSlider::Below);
slayout->addWidget(ll1,1,0);
slayout->addWidget(sl1,1,1);
QObject::connect( sl1, SIGNAL(valueChanged(int)),
this, SLOT(sl1ValueChanged(int)) );
QToolTip::add(sl1,i18n("Brightness"));
QToolTip::add(ll1,i18n("Brightness"));
QPixmap pm2 = BarIcon("colourness");
QLabel* ll2 = new QLabel(bigWidget);
ll2->setPixmap(pm2);
ll2->setFixedSize( ll2->sizeHint() );
sl2 = new QSlider(0,100,10,0,QSlider::Horizontal,bigWidget);
sl2->setTickmarks(QSlider::Below);
slayout->addWidget(ll2,2,0);
slayout->addWidget(sl2,2,1);
QObject::connect( sl2, SIGNAL(valueChanged(int)),
this, SLOT(sl2ValueChanged(int)) );
QToolTip::add(sl2,i18n("Colourness"));
QToolTip::add(ll2,i18n("Colourness"));
QLabel *smlWidget = new QLabel( i18n("This is work in progress."), bigWidget );
QToolTip::add(smlWidget,i18n("This is work in progress."));
//smlWidget->setFrameStyle( QFrame::Panel | QFrame::Sunken );
smlWidget->setAlignment( AlignCenter );
//smlWidget->setBackgroundMode(PaletteBase);
topLayout->addMultiCellWidget( smlWidget, 3,3, 1,2 );
ColorSchema::loadAllSchemas();
for (int i = 0; i < ColorSchema::count(); i++)
{ ColorSchema* s = ColorSchema::find(i);
// assert( s );
lbox->insertItem(s->title.data());
}
topLayout->activate();
QObject::connect( lbox, SIGNAL( highlighted(int) ),
this, SLOT( setSchema(int) ) );
lbox->setCurrentItem(0); // Konsole default
Contents
( i18n(
"Color Schema Management"
),
bigWidget,
i18n(
"Color Schemas define a palette of colors together with further "
"specifications of the rendering."
)
);
}
void SchemaConfig::sl0ValueChanged(int n)
{ int i;
for (i = 0; i < 6; i++)
{
colorTableW[i]->scale = n / 100.0;
colorTableW[i]->update();
}
}
void SchemaConfig::sl1ValueChanged(int n)
{ int i;
for (i = 0; i < 6; i++)
{
colorTableW[i]->shift = n / 100.0;
colorTableW[i]->update();
}
}
void SchemaConfig::sl2ValueChanged(int n)
{ int i;
for (i = 0; i < 6; i++)
{
colorTableW[i]->color = n / 100.0;
colorTableW[i]->update();
}
}
void SchemaConfig::setSchema(int n)
{ int i;
for (i = 0; i < 6; i++)
{
colorTableW[i]->setSchema(ColorSchema::find(n));
colorTableW[i]->scale = 1.0;
colorTableW[i]->shift = 0.5;
colorTableW[i]->color = 1.0;
}
sl0->setValue(100);
sl1->setValue(50);
sl2->setValue(100);
}
SchemaConfig::~SchemaConfig()
{
}
//--| Session configuration |----------------------------------------------------
SessionConfig::SessionConfig(QWidget* parent) : PageFrame(parent)
{
QLabel *bigWidget = new QLabel( i18n("This is work in progress."), this );
bigWidget->setFrameStyle( QFrame::Panel | QFrame::Sunken );
bigWidget->setAlignment( AlignCenter );
bigWidget->setBackgroundMode(PaletteBase);
Contents
( i18n(
"Session Management"
),
bigWidget,
i18n(
"Sessions are actually commands that can be executed from within "
"konsole."
)
);
}
SessionConfig::~SessionConfig()
{
}
//--| Kcontrol pages //|--------------------------------------------------------
KcmKonsole::KcmKonsole(int &argc, char **argv, const char *name)
: KControlApplication(argc, argv, name)
{
if (runGUI())
{
// if (!pages || pages->contains("schemes"))
addPage(schemes = new SchemaConfig(dialog),
i18n("&Color Schemes"),
"kcmkonsole-not-written-yet.html");
// if (!pages || pages->contains("general"))
addPage(general = new GeneralPage(dialog),
i18n("&General"),
"kcmkonsole-not-written-yet.html");
// if (!pages || pages->contains("sessions"))
addPage(sessions = new SessionConfig(dialog),
i18n("&Sessions"),
"kcmkonsole-not-written-yet.html");
if (schemes || sessions || general)
dialog->show();
else
{
fprintf(stderr, i18n("usage:"));
fprintf(stderr, "kcmkonsole [-init | schemes | general | sessions]\n");
justInit = TRUE;
}
}
}
void KcmKonsole::init()
{
}
void KcmKonsole::apply()
{
}
void KcmKonsole::defaultValues()
{
}
int main(int argc, char **argv)
{
KcmKonsole app(argc, argv, "kcmkonsole");
app.setTitle(i18n("Konsole Settings"));
if (app.runGUI())
return app.exec();
else
{
app.init();
return 0;
}
}
#include "kcmkonsole.moc"

@ -367,9 +367,9 @@ void TEDemo::makeMenu()
m_scrollbar = new QPopupMenu;
m_scrollbar->setCheckable(TRUE);
m_scrollbar->insertItem( i18n("&Hide"), SCRNONE);
m_scrollbar->insertItem( i18n("&Left"), SCRLEFT);
m_scrollbar->insertItem( i18n("&Right"), SCRRIGHT);
m_scrollbar->insertItem( i18n("&Hide"), TEWidget::SCRNONE);
m_scrollbar->insertItem( i18n("&Left"), TEWidget::SCRLEFT);
m_scrollbar->insertItem( i18n("&Right"), TEWidget::SCRRIGHT);
connect(m_scrollbar, SIGNAL(activated(int)), SLOT(scrollbar_menu_activated(int)));
m_size = new QPopupMenu;
@ -471,7 +471,7 @@ void TEDemo::readProperties(KConfig* config)
HERE; printf("reading 'history' = %d\n",b_scroll);
b_bshack = config->readBoolEntry("BS hack",TRUE);
n_font = QMIN(config->readUnsignedNumEntry("font",3),TOPFONT);
n_scroll = QMIN(config->readUnsignedNumEntry("scrollbar",SCRRIGHT),2);
n_scroll = QMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2);
s_schema = config->readEntry("schema","");
// Global options ///////////////////////
@ -479,7 +479,7 @@ HERE; printf("reading 'history' = %d\n",b_scroll);
setMenuVisible(config->readBoolEntry("menubar visible",TRUE));
setFrameVisible(config->readBoolEntry("has frame",TRUE));
scrollbar_menu_activated(QMIN(config->readUnsignedNumEntry("scrollbar",SCRRIGHT),2));
scrollbar_menu_activated(QMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2));
// not necessary for SM (KTMainWindow does it after), but useful for default settings
/*FIXME: (merging) state of material below unclear*/

Loading…
Cancel
Save