Attachment #412256 for bug #560830

View | Details | Raw Unified | Return to bug 560830
Collapse All | Expand All

Lines 55-61 Link Here

(-)kpovmodeler-1.1.3-kde4.1.1.orig/pmfactory.cpp (-2 / +2 lines)
55	}	55	}
56		56
57	KParts::Part* PMFactory::createPartObject( QWidget* parentWidget,	57	KParts::Part* PMFactory::createPartObject( QWidget* parentWidget,
58	QObject* parent,	58	QObject* parent,
59	const char* classname,	59	const char* classname,
60	const QStringList& /args/ )	60	const QStringList& /args/ )
61	{	61	{
Lines 76-82 Link Here
76	return *s_instance;	76	return *s_instance;
77	}	77	}
78		78
79	const KAboutData* PMFactory::aboutData( )	79	__attribute__((visibility("default"))) const KAboutData* PMFactory::aboutData( )
80	{	80	{
81	if( !s_aboutData )	81	if( !s_aboutData )
82	{	82	{




const double keyMoveSpeed = 40.0;
const double keyScaleFactor = 1.4;

bool PMGLView::s_bDirect __attribute__((visibility("default"))) = true;


PMGLView::PMGLView( PMPart* part, PMViewType t,


   PMRenderManager* rm = PMRenderManager::theManager( );
   rm->viewCreated( );

   QFrame* frame = new QFrame(this);
   //frame->setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
   frame->setBackgroundRole(QPalette::Highlight);

   pal.setColor(QPalette::Highlight, c);
   frame->setPalette(pal);
   frame->hide();
   m_pDragOverlay = frame;

   setMinimumSize( 50, 50 );


   if( vo && vo->viewType( ) == "glview" )
   {
      PMGLViewOptions* o = ( PMGLViewOptions* ) vo;
      return i18n( "3D View (%1)" ,
         PMGLView::viewTypeAsString( o->glViewType( ) ) );
   }
   return description( );




   m_endColumn = m_width;

   m_quality = 9;

   m_radiosity = false;

   m_antialiasing = false;
   m_samplingMethod = AntialiasingNonRecursive;
   m_antialiasThreshold = 0.3;

      else
         tmp = QString( "+ER%1" ).arg( ( int ) ( m_endRow + 0.5 ) );
      cl.append( tmp );

      if( m_startColumn < 1.0 )
         tmp.sprintf( "+SC%4.2f", m_startColumn );
      else

   }
   cl.append( QString( "+Q%1" ).arg( m_quality ) );
   if( m_radiosity )
      cl.append( QString( "+HR" ) );
   else
      cl.append( QString( "-HR" ) );

   if( m_antialiasing )
   {

Lines 51-57 Link Here

(-)kpovmodeler-1.1.3-kde4.1.1.orig/pmshell.cpp (-1 / +1 lines)
51	const int c_statusBarInfo = 0;	51	const int c_statusBarInfo = 0;
52	const int c_statusBarControlPoints = 1;	52	const int c_statusBarControlPoints = 1;
53		53
54	PMShell::PMShell( const KUrl& url )	54	__attribute__((visibility("default"))) PMShell::PMShell( const KUrl& url )
55	: PMDockMainWindow( 0 )	55	: PMDockMainWindow( 0 )
56	{	56	{
57	setPluginLoadingMode( DoNotLoadPlugins );	57	setPluginLoadingMode( DoNotLoadPlugins );

Return to bug 560830

Lines 62-68 Link Here

(-)kpovmodeler-1.1.3-kde4.1.1.orig/pmglview.cpp (-4 / +4 lines)
62	const double keyMoveSpeed = 40.0;	62	const double keyMoveSpeed = 40.0;
63	const double keyScaleFactor = 1.4;	63	const double keyScaleFactor = 1.4;
64		64
65	bool PMGLView::s_bDirect = true;	65	bool PMGLView::s_bDirect __attribute__((visibility("default"))) = true;
66		66
67		67
68	PMGLView::PMGLView( PMPart* part, PMViewType t,	68	PMGLView::PMGLView( PMPart* part, PMViewType t,
Lines 105-111 Link Here
105		105
106	PMRenderManager* rm = PMRenderManager::theManager( );	106	PMRenderManager* rm = PMRenderManager::theManager( );
107	rm->viewCreated( );	107	rm->viewCreated( );
108		108
109	QFrame* frame = new QFrame(this);	109	QFrame* frame = new QFrame(this);
110	//frame->setFrameStyle(QFrame::StyledPanel \| QFrame::Raised);	110	//frame->setFrameStyle(QFrame::StyledPanel \| QFrame::Raised);
111	frame->setBackgroundRole(QPalette::Highlight);	111	frame->setBackgroundRole(QPalette::Highlight);
Lines 116-122 Link Here
116	pal.setColor(QPalette::Highlight, c);	116	pal.setColor(QPalette::Highlight, c);
117	frame->setPalette(pal);	117	frame->setPalette(pal);
118	frame->hide();	118	frame->hide();
119	m_pDragOverlay = frame;	119	m_pDragOverlay = frame;
120		120
121	setMinimumSize( 50, 50 );	121	setMinimumSize( 50, 50 );
122		122
Lines 1469-1475 Link Here
1469	if( vo && vo->viewType( ) == "glview" )	1469	if( vo && vo->viewType( ) == "glview" )
1470	{	1470	{
1471	PMGLViewOptions* o = ( PMGLViewOptions* ) vo;	1471	PMGLViewOptions* o = ( PMGLViewOptions* ) vo;
1472	return i18n( "3D View (%1)" ,	1472	return i18n( "3D View (%1)" ,
1473	PMGLView::viewTypeAsString( o->glViewType( ) ) );	1473	PMGLView::viewTypeAsString( o->glViewType( ) ) );
1474	}	1474	}
1475	return description( );	1475	return description( );

Lines 38-46 Link Here

(-)kpovmodeler-1.1.3-kde4.1.1.orig/pmrendermode.cpp (-5 / +5 lines)
38	m_endColumn = m_width;	38	m_endColumn = m_width;
39		39
40	m_quality = 9;	40	m_quality = 9;
41		41
42	m_radiosity = false;	42	m_radiosity = false;
43		43
44	m_antialiasing = false;	44	m_antialiasing = false;
45	m_samplingMethod = AntialiasingNonRecursive;	45	m_samplingMethod = AntialiasingNonRecursive;
46	m_antialiasThreshold = 0.3;	46	m_antialiasThreshold = 0.3;
Lines 174-180 Link Here
174	else	174	else
175	tmp = QString( "+ER%1" ).arg( ( int ) ( m_endRow + 0.5 ) );	175	tmp = QString( "+ER%1" ).arg( ( int ) ( m_endRow + 0.5 ) );
176	cl.append( tmp );	176	cl.append( tmp );
177		177
178	if( m_startColumn < 1.0 )	178	if( m_startColumn < 1.0 )
179	tmp.sprintf( "+SC%4.2f", m_startColumn );	179	tmp.sprintf( "+SC%4.2f", m_startColumn );
180	else	180	else
Lines 188-196 Link Here
188	}	188	}
189	cl.append( QString( "+Q%1" ).arg( m_quality ) );	189	cl.append( QString( "+Q%1" ).arg( m_quality ) );
190	if( m_radiosity )	190	if( m_radiosity )
191	cl.append( QString( "+QR" ) );	191	cl.append( QString( "+HR" ) );
192	else	192	else
193	cl.append( QString( "-QR" ) );	193	cl.append( QString( "-HR" ) );
194		194
195	if( m_antialiasing )	195	if( m_antialiasing )
196	{	196	{